Issues tags: refactoring

1 files changed, 9 insertions, 16 deletions

diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index e3480f6af44..b7e98ec8f17 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -18,17 +18,17 @@
     .title
       .left
         %ul.nav.nav-pills.left
-          %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
-            = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
+          %li{:class => ("active" if (params[:f] == issues_filter[:open] || !params[:f]))}
+            = link_to project_issues_path(@project, :f => issues_filter[:open], :milestone_id => params[:milestone_id]) do
               Open
-          %li{:class => ("active" if params[:f] == "2")}
-            = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
+          %li{:class => ("active" if params[:f] == issues_filter[:closed])}
+            = link_to project_issues_path(@project, :f => issues_filter[:closed], :milestone_id => params[:milestone_id]) do
               Closed
-          %li{:class => ("active" if params[:f] == "3")}
-            = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
+          %li{:class => ("active" if params[:f] == issues_filter[:to_me])}
+            = link_to project_issues_path(@project, :f => issues_filter[:to_me], :milestone_id => params[:milestone_id]) do
               To Me
-          %li{:class => ("active" if params[:f] == "1")}
-            = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
+          %li{:class => ("active" if params[:f] == issues_filter[:all])}
+            = link_to project_issues_path(@project, :f => issues_filter[:all], :milestone_id => params[:milestone_id]) do
               All
 
       .right
@@ -44,14 +44,7 @@
 
 :javascript
   $(function(){
-    initIssuesSearch();
-    setSortable();
-    $("#label_name").chosen();
-    $("#assignee_id").chosen();
-    $("#milestone_id").chosen();
-    $("#milestone_id, #assignee_id, #label_name").live("change", function(){
-      $(this).closest("form").submit();
-    });
+    issuesPage();
   })
 
   function setSortable(){