SONAR-4884 Small improvements and bug fixes

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index 7ba067da273f7248e0cff7c0f8191789c3b4b724..bfde5908f07761d1d3657bcd3d54b8e25c794efe 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -82,6 +82,7 @@
     { key: '<%= "c#{i}_val" -%>', value: '<%= h @filter.criteria("c#{i}_val") -%>' },
     <% end %>
 
+    { key: 'nameSearch', value: '<%= h @filter.criteria['nameSearch'] -%>' }
   ];
 
   window.SS.MeasuresNavigatorApp.start();

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
index e070a1c845c8f16e5bfb172b1f4a3f2e7e3c260c..ebb187190e357e9ca31db03b1a9d01aab9d09256 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
@@ -29,9 +29,15 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
 
     onRender: function() {
       var value = this.model.get('value') || {};
-      this.$('[name=metric]').val(value.metric);
-      this.$('[name=period]').val(value.period);
-      this.$('[name=op]').val(value.op);
+      this.$('[name=metric]').val(value.metric).select2({
+        width: '100%'
+      });
+      this.$('[name=period]').val(value.period).select2({
+        width: '100%'
+      });
+      this.$('[name=op]').val(value.op).select2({
+        width: '60px'
+      });
       this.$('[name=val]').val(value.val);
       this.inputChanged();
     }

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
index 5681ca8f3d735075010510918814c3facdacef38..a8290e15e7022bf4f35d070e973dcd4f852f1fbd 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js
@@ -57,6 +57,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
         this.options.filterView.choices.remove(model);
       } else {
         this.options.filterView.choices.add(this.options.filterView.selection.models);
+        this.options.filterView.choices.remove(model);
         this.options.filterView.selection.reset([model]);
       }
 

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.css b/sonar-server/src/main/webapp/stylesheets/navigator.css
index c029246d1eeb1a019dde03cb1413beb5e43cd241..0361076e572348185b82721d033fd680de6e0d51 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator.css
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.css
@@ -124,8 +124,9 @@
   max-width: 300px;
   padding: 5px 10px;
 }
-.navigator-filter-details-inner select {
-  display: block;
+.navigator-filter-details-inner .select2-container,
+.navigator-filter-details-inner input {
+  margin: 5px 0;
 }
 .navigator-filter-select-list {
   min-width: 150px;

diff --git a/sonar-server/src/main/webapp/stylesheets/navigator.less b/sonar-server/src/main/webapp/stylesheets/navigator.less
index be4b6b921d3e2aa3da30fe118929cd5ecccbf6bd..2f86d1a3d720c12fe5ce4176288c1f68a8333825 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/navigator.less
+++ b/sonar-server/src/main/webapp/stylesheets/navigator.less
@@ -147,8 +147,9 @@
   max-width: 300px;
   padding: 5px @navigatorFilterPadding;
 
-  select {
-    display: block;
+  .select2-container,
+  input {
+    margin: 5px 0;
   }
 }