|
1
|
Index: D:/dev/radrails/redmine/app/controllers/projects_controller.rb
|
|
2
|
===================================================================
|
|
3
|
--- D:/dev/radrails/redmine/app/controllers/projects_controller.rb (revision 446)
|
|
4
|
+++ D:/dev/radrails/redmine/app/controllers/projects_controller.rb (working copy)
|
|
5
|
@@ -245,6 +245,9 @@
|
|
6
|
|
|
7
|
# Show filtered/sorted issues list of @project
|
|
8
|
def list_issues
|
|
9
|
+ #to list possible new statuses for issues - Daniele Mazzini
|
|
10
|
+ @logged_in_user = logged_in_user
|
|
11
|
+
|
|
12
|
sort_init "#{Issue.table_name}.id", "desc"
|
|
13
|
sort_update
|
|
14
|
|
|
15
|
Index: D:/dev/radrails/redmine/app/views/projects/list_issues.rhtml
|
|
16
|
===================================================================
|
|
17
|
--- D:/dev/radrails/redmine/app/views/projects/list_issues.rhtml (revision 446)
|
|
18
|
+++ D:/dev/radrails/redmine/app/views/projects/list_issues.rhtml (working copy)
|
|
19
|
@@ -60,7 +60,9 @@
|
|
20
|
<th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
|
|
21
|
<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
|
|
22
|
<td align="center"><%= issue.tracker.name %></td>
|
|
23
|
- <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
|
|
24
|
+ <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div>
|
|
25
|
+ <%= render :partial => 'issues/status_select', :locals => {:issue => issue} %>
|
|
26
|
+ </td>
|
|
27
|
<td align="center"><%= issue.priority.name %></td>
|
|
28
|
<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
|
|
29
|
<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
|
|
30
|
Index: D:/dev/radrails/redmine/app/views/issues/_status_select.rhtml
|
|
31
|
===================================================================
|
|
32
|
--- D:/dev/radrails/redmine/app/views/issues/_status_select.rhtml (revision 0)
|
|
33
|
+++ D:/dev/radrails/redmine/app/views/issues/_status_select.rhtml (revision 0)
|
|
34
|
@@ -0,0 +1,11 @@
|
|
35
|
+ <% @project = issue.project; @logged_in_user = @user unless @logged_in_user #ugly, but necessary to use authorize_for
|
|
36
|
+ %>
|
|
37
|
+ <% status_options = issue.status.find_new_statuses_allowed_to(@logged_in_user.role_for_project(issue.project), issue.tracker) if @logged_in_user %>
|
|
38
|
+ <% if authorize_for('issues', 'change_status') and status_options and !status_options.empty? %>
|
|
39
|
+ <%= select_tag 'new_status_id',
|
|
40
|
+ ("<option value='#{issue.id.to_s}'>#{issue.status.name}</option>" + options_from_collection_for_select(status_options, 'id', 'name')),
|
|
41
|
+ :onchange => "if (this.value!='') {window.location = '/issues/change_status/#{issue.id.to_s}?new_status_id='+this.value;}" %>
|
|
42
|
+ <% else %>
|
|
43
|
+ <%= issue.status.name %>
|
|
44
|
+ <% end %>
|
|
45
|
+
|
|
46
|
\ No newline at end of file
|
|
47
|
Index: D:/dev/radrails/redmine/app/views/issues/_list_simple.rhtml
|
|
48
|
===================================================================
|
|
49
|
--- D:/dev/radrails/redmine/app/views/issues/_list_simple.rhtml (revision 446)
|
|
50
|
+++ D:/dev/radrails/redmine/app/views/issues/_list_simple.rhtml (working copy)
|
|
51
|
@@ -11,8 +11,9 @@
|
|
52
|
<th align="center">
|
|
53
|
<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
|
|
54
|
</th>
|
|
55
|
- <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
|
|
56
|
- <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
|
|
57
|
+ <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <p class="small"><%= issue.project.name %> - <%= issue.tracker.name %> -
|
|
58
|
+ <%= render :partial => 'issues/status_select', :locals => {:issue => issue} %>
|
|
59
|
+ <br /> <%= format_time(issue.updated_on) %></p></td>
|
|
60
|
<td>
|
|
61
|
<p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p>
|
|
62
|
</td>
|