From 188a74c3a2e16329eae9abc0006830dbfdea0472 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 8 May 2013 10:06:48 +0300 Subject: [PATCH] init filter links --- app/helpers/issues_helper.rb | 11 +++++++++++ app/views/issues/_issues.html.haml | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 6a4d5a30917..dc5aa6e1fb6 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -78,4 +78,15 @@ module IssuesHelper "" end end + + def project_issues_with_filter_path(project, opts) + default_opts = { + status: params[:status], + label_name: params[:label_name], + milestone_id: params[:milestone_id], + assignee_id: params[:assignee_id], + } + + project_issues_path(@project, default_opts.merge(opts)) + end end diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index 1438803efb2..4233e2466e5 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -19,7 +19,7 @@ %a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"} %i.icon-tags %span.light labels: - - if params[:label_name] + - if params[:label_name].present? %strong= params[:label_name] - else Any @@ -27,7 +27,7 @@ %ul.dropdown-menu - issue_label_names.each do |label_name| %li - = link_to '#' do + = link_to project_issues_with_filter_path(@project, label_name: label_name) do %span{class: "label #{label_css_class(label_name)}"} %i.icon-tag = label_name @@ -43,7 +43,7 @@ %ul.dropdown-menu - @project.users.sort_by(&:name).each do |user| %li - = link_to '#' do + = link_to project_issues_with_filter_path(@project, assignee_id: user.id) do = image_tag gravatar_icon(user.email), class: "avatar s16" = user.name @@ -59,7 +59,7 @@ %ul.dropdown-menu - issues_active_milestones.each do |milestone| %li - = link_to '#' do + = link_to project_issues_with_filter_path(@project, milestone_id: milestone.id) do %strong= milestone.title %small.light= milestone.expires_at -- GitLab