| @@ -466,10 +466,6 class IssuesController < ApplicationController | |||||
| 466 |
|
466 | |||
| 467 | @priorities = IssuePriority.active |
|
467 | @priorities = IssuePriority.active | |
| 468 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?) |
|
468 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?) | |
| 469 | @available_watchers = @issue.watcher_users |
|
|||
| 470 | if @issue.project.users.count <= 20 |
|
|||
| 471 | @available_watchers = (@available_watchers + @issue.project.users.sort).uniq |
|
|||
| 472 | end |
|
|||
| 473 | end |
|
469 | end | |
| 474 |
|
470 | |||
| 475 | def parse_params_for_bulk_issue_attributes(params) |
|
471 | def parse_params_for_bulk_issue_attributes(params) | |
| @@ -217,6 +217,16 module IssuesHelper | |||||
| 217 | message |
|
217 | message | |
| 218 | end |
|
218 | end | |
| 219 |
|
219 | |||
|
|
220 | # Returns an array of users that are proposed as watchers | |||
|
|
221 | # on the new issue form | |||
|
|
222 | def users_for_new_issue_watchers(issue) | |||
|
|
223 | users = issue.watcher_users | |||
|
|
224 | if issue.project.users.count <= 20 | |||
|
|
225 | users = (users + issue.project.users.sort).uniq | |||
|
|
226 | end | |||
|
|
227 | users | |||
|
|
228 | end | |||
|
|
229 | ||||
| 220 | def sidebar_queries |
|
230 | def sidebar_queries | |
| 221 | unless @sidebar_queries |
|
231 | unless @sidebar_queries | |
| 222 | @sidebar_queries = IssueQuery.visible. |
|
232 | @sidebar_queries = IssueQuery.visible. | |
| @@ -35,7 +35,7 | |||||
| 35 | <% if @issue.safe_attribute? 'watcher_user_ids' -%> |
|
35 | <% if @issue.safe_attribute? 'watcher_user_ids' -%> | |
| 36 | <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label> |
|
36 | <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label> | |
| 37 | <span id="watchers_inputs"> |
|
37 | <span id="watchers_inputs"> | |
| 38 |
<%= watchers_checkboxes(@issue, |
|
38 | <%= watchers_checkboxes(@issue, users_for_new_issue_watchers(@issue)) %> | |
| 39 | </span> |
|
39 | </span> | |
| 40 | <span class="search_for_watchers"> |
|
40 | <span class="search_for_watchers"> | |
| 41 | <%= link_to l(:label_search_for_watchers), |
|
41 | <%= link_to l(:label_search_for_watchers), | |
General Comments 0
You need to be logged in to leave comments.
Login now