Move issues/mr filter to partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
eb12e3ab56
commit
ed2eaf55c1
|
@ -0,0 +1,49 @@
|
|||
.issues-filters
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-user
|
||||
%span.light assignee:
|
||||
- if @assignee.present?
|
||||
%strong= @assignee.name
|
||||
- elsif params[:assignee_id] == "0"
|
||||
Unassigned
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(assignee_id: 0) do
|
||||
Unassigned
|
||||
- @assignees.sort_by(&:name).each do |user|
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: user.id) do
|
||||
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
|
||||
= user.name
|
||||
|
||||
.dropdown.inline.prepend-left-10
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-clock-o
|
||||
%span.light milestone:
|
||||
- if @milestone.present?
|
||||
%strong= @milestone.title
|
||||
- elsif params[:milestone_id] == "0"
|
||||
None (backlog)
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(milestone_id: 0) do
|
||||
None (backlog)
|
||||
- project_active_milestones.each do |milestone|
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: milestone.id) do
|
||||
%strong= milestone.title
|
||||
%small.light= milestone.expires_at
|
||||
|
||||
.pull-right
|
||||
= render 'shared/sort_dropdown'
|
|
@ -1,55 +1,7 @@
|
|||
.append-bottom-10
|
||||
.check-all-holder
|
||||
= check_box_tag "check_all_issues", nil, false, class: "check_all_issues left"
|
||||
.issues-filters
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-user
|
||||
%span.light assignee:
|
||||
- if @assignee.present?
|
||||
%strong= @assignee.name
|
||||
- elsif params[:assignee_id] == "0"
|
||||
Unassigned
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(assignee_id: 0) do
|
||||
Unassigned
|
||||
- @assignees.sort_by(&:name).each do |user|
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: user.id) do
|
||||
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
|
||||
= user.name
|
||||
|
||||
.dropdown.inline.prepend-left-10
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-clock-o
|
||||
%span.light milestone:
|
||||
- if @milestone.present?
|
||||
%strong= @milestone.title
|
||||
- elsif params[:milestone_id] == "0"
|
||||
None (backlog)
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(milestone_id: 0) do
|
||||
None (backlog)
|
||||
- project_active_milestones.each do |milestone|
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: milestone.id) do
|
||||
%strong= milestone.title
|
||||
%small.light= milestone.expires_at
|
||||
|
||||
.pull-right
|
||||
= render 'shared/sort_dropdown'
|
||||
= render 'projects/issuable_filter'
|
||||
|
||||
.clearfix
|
||||
.issues_bulk_update.hide
|
||||
|
|
|
@ -5,56 +5,8 @@
|
|||
= render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
|
||||
labels: true, redirect: 'merge_requests', entity: 'merge_request'
|
||||
.col-md-9
|
||||
.mr-filters.append-bottom-10
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-user
|
||||
%span.light assignee:
|
||||
- if @assignee.present?
|
||||
%strong= @assignee.name
|
||||
- elsif params[:assignee_id] == "0"
|
||||
Unassigned
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(assignee_id: 0) do
|
||||
Unassigned
|
||||
- @assignees.sort_by(&:name).each do |user|
|
||||
%li
|
||||
= link_to project_filter_path(assignee_id: user.id) do
|
||||
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''
|
||||
= user.name
|
||||
|
||||
.dropdown.inline.prepend-left-10
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%i.fa.fa-clock-o
|
||||
%span.light milestone:
|
||||
- if @milestone.present?
|
||||
%strong= @milestone.title
|
||||
- elsif params[:milestone_id] == "0"
|
||||
None (backlog)
|
||||
- else
|
||||
Any
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: nil) do
|
||||
Any
|
||||
= link_to project_filter_path(milestone_id: 0) do
|
||||
None (backlog)
|
||||
- project_active_milestones.each do |milestone|
|
||||
%li
|
||||
= link_to project_filter_path(milestone_id: milestone.id) do
|
||||
%strong= milestone.title
|
||||
%small.light= milestone.expires_at
|
||||
|
||||
.pull-right
|
||||
= render 'shared/sort_dropdown'
|
||||
|
||||
.append-bottom-10
|
||||
= render 'projects/issuable_filter'
|
||||
.panel.panel-default
|
||||
%ul.well-list.mr-list
|
||||
= render @merge_requests
|
||||
|
|
Loading…
Reference in New Issue