From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 28 Nov 2013 05:51:50 +0000 (+0600)
Subject: SONAR-4884 Small improvements and bug fixes
X-Git-Tag: 4.1-RC1~193
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f0b551e96b9e2e9a1c780fdd09b3b0824ad2506a;p=sonarqube.git

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 7ba067da273..bfde5908f07 100644
--- 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 e070a1c845c..ebb187190e3 100644
--- 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 5681ca8f3d7..a8290e15e70 100644
--- 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 c029246d1ee..0361076e572 100644
--- 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 be4b6b921d3..2f86d1a3d72 100644
--- 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;
   }
 }