Download as
Browse Code »

Commit 642f9f4a1cd66152846d0bc61fba2efd550edd33

Authored by Sytse Sijbrandij
1 parent d0357f3b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Scrum view style milestone view.

Showing 4 changed files with 20 additions and 20 deletions   Show diff stats
app/assets/javascripts/milestones.js.coffee
  Diff comments   View file @642f9f4
1 $ -> 1 $ ->
2 - $('.milestone-issue-filter li[data-closed]').addClass('hide')  
3 -  
4 - $('.milestone-issue-filter ul.nav li a').click ->  
5 - $('.milestone-issue-filter li').toggleClass('active')  
6 - $('.milestone-issue-filter li[data-closed]').toggleClass('hide')  
7 - false  
8 -  
9 $('.milestone-merge-requests-filter li[data-closed]').addClass('hide') 2 $('.milestone-merge-requests-filter li[data-closed]').addClass('hide')
10 3
11 $('.milestone-merge-requests-filter ul.nav li a').click -> 4 $('.milestone-merge-requests-filter ul.nav li a').click ->
app/models/issue.rb
  Diff comments   View file @642f9f4
@@ -28,6 +28,8 @@ class Issue < ActiveRecord::Base @@ -28,6 +28,8 @@ class Issue < ActiveRecord::Base
28 scope :cared, ->(user) { where(assignee_id: user) } 28 scope :cared, ->(user) { where(assignee_id: user) }
29 scope :authored, ->(user) { where(author_id: user) } 29 scope :authored, ->(user) { where(author_id: user) }
30 scope :open_for, ->(user) { opened.assigned(user) } 30 scope :open_for, ->(user) { opened.assigned(user) }
  31 + scope :assigned, where("assignee_id IS NOT NULL")
  32 + scope :unassigned, where("assignee_id IS NULL")
31 33
32 state_machine :state, initial: :opened do 34 state_machine :state, initial: :opened do
33 event :close do 35 event :close do
app/views/milestones/_issues.html.haml 0 → 100644
  Diff comments   View file @642f9f4
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +.span6
  2 + .ui-box.milestone-issue-filter
  3 + .title
  4 + %ul.nav.nav-pills
  5 + %li=issues.first
  6 + %ul.well-list
  7 + - issues.second.each do |issue|
  8 + %li{data: {closed: issue.closed?}}
  9 + = link_to [@project, issue] do
  10 + %span.badge.badge-info ##{issue.id}
  11 + –
  12 + = link_to_gfm truncate(issue.title, length: 60), [@project, issue]
0 \ No newline at end of file 13 \ No newline at end of file
app/views/milestones/show.html.haml
  Diff comments   View file @642f9f4
@@ -56,20 +56,11 @@ @@ -56,20 +56,11 @@
56 56
57 57
58 .row 58 .row
59 - .span6  
60 - .ui-box.milestone-issue-filter  
61 - .title  
62 - %ul.nav.nav-pills  
63 - %li.active= link_to('Open Issues', '#')  
64 - %li=link_to('All Issues', '#')  
65 - %ul.well-list  
66 - - @issues.each do |issue|  
67 - %li{data: {closed: issue.closed?}}  
68 - = link_to [@project, issue] do  
69 - %span.badge.badge-info ##{issue.id}  
70 - –  
71 - = link_to_gfm truncate(issue.title, length: 60), [@project, issue] 59 + =render(:partial => 'issues', :object => ['Unstarted Issues (open and unassigned)', @issues.opened.unassigned])
  60 +
  61 + =render(:partial => 'issues', :object => ['Ongoing Issues (open and assigned) ', @issues.opened.assigned])
72 62
  63 +.row
73 .span6 64 .span6
74 .ui-box.milestone-merge-requests-filter 65 .ui-box.milestone-merge-requests-filter
75 .title 66 .title
@@ -84,6 +75,8 @@ @@ -84,6 +75,8 @@
84 – 75 –
85 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request] 76 = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
86 77
  78 + =render(:partial => 'issues', :object => ['Completed Issues (closed)', @issues.closed])
  79 +
87 %hr 80 %hr
88 %h6 Participants: 81 %h6 Participants:
89 %div 82 %div