SONAR-4851 Add filter id, add full list of choices for select filters

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index dba1b98b436ff89c22bbc899ecd47ff7be370600..c2114878b35780808033a24a1076cb793edbcd3a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -32,6 +32,12 @@
 
 <script id="filterBarTemplate" type="text/template">
   <form method="get" action="<%= ApplicationController.root_context -%>/issues/search">
+    <% if @filter && @filter.id %>
+      <input type="hidden" name="id" value="<%= h @filter.id.to_s -%>">
+    <% end %>
+    <input type="hidden" name="sort" value="<%= h @issues_query.sort -%>"/>
+    <input type="hidden" name="asc" value="<%= h @issues_query.asc -%>"/>
+
     <div class="navigator-filters-list"></div>
     <button class="navigator-filter-submit">Search</button>
   </form>
@@ -85,7 +91,7 @@
     <li class="line"></li>
     {[ } ]}
     <li class="manage">
-      <label>Manage</label>
+      <label id="manage-favorites">Manage</label>
     </li>
   </ul>
 </script>

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 5d2998ea984c0fe7db6df7b20720407b5fd299f7..7a4cc0664d0e18a50ccb5fde63a270e2b3fef9e0 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
@@ -115,7 +115,14 @@ window.SS = typeof window.SS === 'object' ? window.SS : {};
       this.selection.each(function(item) {
         var option = $j('<option>')
             .prop('value', item.get('id'))
-            .prop('selected', true);
+            .prop('selected', true)
+            .text(item.get('text'));
+        option.appendTo(input);
+      });
+      this.choices.each(function(item) {
+        var option = $j('<option>')
+            .prop('value', item.get('id'))
+            .text(item.get('text'));
         option.appendTo(input);
       });
       input.appendTo(this.$el);