refactor Issues.js. Remove unused actions. Respect filters while searching for issue

3 files changed, 8 insertions, 5 deletions

diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 217956d7284..93fa9da2767 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -18,6 +18,7 @@
           = select_tag(:assignee_id, options_from_collection_for_select([unassigned_filter] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee")
           = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone")
           = hidden_field_tag :status, params[:status]
+          = hidden_field_tag :issue_search, params[:status], id: 'filter_issue_search'
 
   %ul.well-list.issues-list
     = render @issues
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 78b677899d4..4edc1d9b912 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -9,9 +9,11 @@
           = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
             %i.icon-plus
             New Issue
-        = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
-          = hidden_field_tag :project_id, @project.id, { id: 'project_id' }
-          = hidden_field_tag :status, params[:status]
+        = form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right'  do
+          = hidden_field_tag :status, params[:status], id: 'search_status'
+          = hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
+          = hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
+          = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
           = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
 
   .clearfix
@@ -24,5 +26,5 @@
 
 :javascript
   $(function(){
-    issuesPage();
+    Issues.init();
   })
diff --git a/app/views/issues/index.js.haml b/app/views/issues/index.js.haml
index dc77be13f27..1be6a64f535 100644
--- a/app/views/issues/index.js.haml
+++ b/app/views/issues/index.js.haml
@@ -1,4 +1,4 @@
 :plain
   $('.issues-holder').html("#{escape_javascript(render('issues'))}");
   History.replaceState({path: "#{request.url}"}, document.title, "#{request.url}");
-  issuesPage();
+  Issues.reload();