SONAR-4884 Changes after feedback

4 files changed, 16 insertions, 10 deletions

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 965590f3d93..c31238de857 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
@@ -33,7 +33,7 @@
 
     <div class="navigator-filters-list"></div>
     <button class="navigator-filter-submit"><%= message('search_verb') -%></button>
-    <a class="navigator-filter-new-search link-action" href="<%= ApplicationController.root_context -%>/measures/search"><%= message 'issue_filter.new_search' -%></a>
+    <a class="navigator-filter-new-search link-action" href="<%= ApplicationController.root_context -%>/measures"><%= message 'issue_filter.new_search' -%></a>
   </form>
 </script>
 
@@ -89,4 +89,8 @@
 
   window.SS.MeasuresNavigatorApp.start();
   window.SS.MeasuresNavigatorApp.filterBarView.restoreFromQuery(queryParams);
+
+  if ($j('.operations').length === 0) {
+    $j('input[type=checkbox][value=TRK]').click();
+  }
 </script>
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js
index cecbd227ba0..39307a3525c 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/base-filters.js
@@ -175,6 +175,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
 
     disable: function(e) {
       e.stopPropagation();
+      this.hideDetails();
       this.model.set({
         enabled: false,
         value: null
@@ -263,6 +264,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
 
       filterView.$el.detach().insertBefore(this.$('.navigator-filter-more-criteria'));
       filter.set('enabled', true);
+      filterView.showDetails();
     },
 
 
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
index c2b38d588aa..b9aa84984f0 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
@@ -76,6 +76,14 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
       }),
 
       new window.SS.Filter({
+        name: 'Assignee',
+        property: 'assignees',
+        type: window.SS.AssigneeFilterView,
+        enabled: true,
+        optional: false
+      }),
+
+      new window.SS.Filter({
         name: 'Resolution',
         property: 'resolutions[]',
         type: window.SS.SelectFilterView,
@@ -89,14 +97,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
       }),
 
       new window.SS.Filter({
-        name: 'Assignee',
-        property: 'assignees',
-        type: window.SS.AssigneeFilterView,
-        enabled: true,
-        optional: false
-      }),
-
-      new window.SS.Filter({
         name: 'Reporter',
         property: 'reporters',
         type: window.SS.ReporterFilterView,
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js b/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js
index 496ab32c4a3..0a95b706de1 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/measures-app.js
@@ -31,7 +31,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
 
     this.filters.add([
       new window.SS.Filter({
-        name: 'Qualifiers',
+        name: 'Components',
         property: 'qualifiers[]',
         type: window.SS.SelectFilterView,
         enabled: true,