jro_apps/redmine Commit - r13613:9548d39a15c1

Moved users list diplayed as available watchers on the new issue form to an helper....

Jean-Philippe Lang -

r13613:9548d39a15c1

parent child

Context file:

r13613:9548d39a15c1

Collapse all files

app/controllers/issues_controller.rb 0 -4

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssuesController < ApplicationController
               menu_item :new_issue, :only => [:new, :create]
               default_search_scope :issues
               before_filter :find_issue, :only => [:show, :edit, :update]
               before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :find_project, :only => [:new, :create, :update_form]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => [:index]
               before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
               accept_rss_auth :index, :show
               accept_api_auth :index, :show, :create, :update, :destroy
               rescue_from Query::StatementInvalid, :with => :query_statement_invalid
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               helper :sort
               include SortHelper
               include IssuesHelper
               helper :timelog
               def index
                 retrieve_query
                 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                 sort_update(@query.sortable_columns)
                 @query.sort_criteria = sort_criteria.to_a
                 if @query.valid?
                   case params[:format]
                   when 'csv', 'pdf'
                     @limit = Setting.issues_export_limit.to_i
                     if params[:columns] == 'all'
                       @query.column_names = @query.available_inline_columns.map(&:name)
                     end
                   when 'atom'
                     @limit = Setting.feeds_limit.to_i
                   when 'xml', 'json'
                     @offset, @limit = api_offset_and_limit
                     @query.column_names = %w(author)
                   else
                     @limit = per_page_option
                   end
                   @issue_count = @query.issue_count
                   @issue_pages = Paginator.new @issue_count, @limit, params['page']
                   @offset ||= @issue_pages.offset
                   @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                           :order => sort_clause,
                                           :offset => @offset,
                                           :limit => @limit)
                   @issue_count_by_group = @query.issue_count_by_group
                   respond_to do |format|
                     format.html { render :template => 'issues/index', :layout => !request.xhr? }
                     format.api  {
                       Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
                     }
                     format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                     format.csv  { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
                     format.pdf  { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' }
                   end
                 else
                   respond_to do |format|
                     format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
                     format.any(:atom, :csv, :pdf) { render(:nothing => true) }
                     format.api { render_validation_errors(@query) }
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def show
                 @journals = @issue.journals.includes(:user, :details).
                                 references(:user, :details).
                                 reorder("#{Journal.table_name}.id ASC").to_a
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                 Journal.preload_journals_details_custom_fields(@journals)
                 @journals.select! {|journal| journal.notes? || journal.visible_details.any?}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @changesets = @issue.changesets.visible.to_a
                 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = IssuePriority.active
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 @relation = IssueRelation.new
                 respond_to do |format|
                   format.html {
                     retrieve_previous_and_next_issue_ids
                     render :template => 'issues/show'
                   }
                   format.api
                   format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  {
                     send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf"
                   }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 respond_to do |format|
                   format.html { render :action => 'new', :layout => !request.xhr? }
                 end
               end
               def create
                 unless User.current.allowed_to?(:add_issues, @issue.project)
                   raise ::Unauthorized
                 end
                 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
                 if @issue.save
                   call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                   respond_to do |format|
                     format.html {
                       render_attachment_warning_if_needed(@issue)
                       flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
                       if params[:continue]
                         attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
                         redirect_to new_project_issue_path(@issue.project, :issue => attrs)
                       else
                         redirect_to issue_path(@issue)
                       end
                     }
                     format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
                   end
                   return
                 else
                   respond_to do |format|
                     format.html { render :action => 'new' }
                     format.api  { render_validation_errors(@issue) }
                   end
                 end
               end
               def edit
                 return unless update_issue_from_params
                 respond_to do |format|
                   format.html { }
                   format.xml  { }
                 end
               end
               def update
                 return unless update_issue_from_params
                 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
                 saved = false
                 begin
                   saved = save_issue_with_child_records
                 rescue ActiveRecord::StaleObjectError
                   @conflict = true
                   if params[:last_journal_id]
                     @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a
                     @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
                   end
                 end
                 if saved
                   render_attachment_warning_if_needed(@issue)
                   flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
                   respond_to do |format|
                     format.html { redirect_back_or_default issue_path(@issue) }
                     format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'edit' }
                     format.api  { render_validation_errors(@issue) }
                   end
                 end
               end
               # Updates the issue form when changing the project, status or tracker
               # on issue creation/update
               def update_form
               end
               # Bulk edit/copy a set of issues
               def bulk_edit
                 @issues.sort!
                 @copy = params[:copy].present?
                 @notes = params[:notes]
                 if @copy
                   unless User.current.allowed_to?(:copy_issues, @projects)
                     raise ::Unauthorized
                   end
                 end
                 @allowed_projects = Issue.allowed_target_projects
                 if params[:issue]
                   @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
                   if @target_project
                     target_projects = [@target_project]
                   end
                 end
                 target_projects ||= @projects
                 if @copy
                   # Copied issues will get their default statuses
                   @available_statuses = []
                 else
                   @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
                 end
                 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
                 @assignables = target_projects.map(&:assignable_users).reduce(:&)
                 @trackers = target_projects.map(&:trackers).reduce(:&)
                 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
                 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
                 if @copy
                   @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
                   @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
                 end
                 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
                 @issue_params = params[:issue] || {}
                 @issue_params[:custom_field_values] ||= {}
               end
               def bulk_update
                 @issues.sort!
                 @copy = params[:copy].present?
                 attributes = parse_params_for_bulk_issue_attributes(params)
                 if @copy
                   unless User.current.allowed_to?(:copy_issues, @projects)
                     raise ::Unauthorized
                   end
                   target_projects = @projects
                   if attributes['project_id'].present?
                     target_projects = Project.where(:id => attributes['project_id']).to_a
                   end
                   unless User.current.allowed_to?(:add_issues, target_projects)
                     raise ::Unauthorized
                   end
                 end
                 unsaved_issues = []
                 saved_issues = []
                 if @copy && params[:copy_subtasks].present?
                   # Descendant issues will be copied with the parent task
                   # Don't copy them twice
                   @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
                 end
                 @issues.each do |orig_issue|
                   orig_issue.reload
                   if @copy
                     issue = orig_issue.copy({},
                       :attachments => params[:copy_attachments].present?,
                       :subtasks => params[:copy_subtasks].present?,
                       :link => link_copy?(params[:link_copy])
                     )
                   else
                     issue = orig_issue
                   end
                   journal = issue.init_journal(User.current, params[:notes])
                   issue.safe_attributes = attributes
                   call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                   if issue.save
                     saved_issues << issue
                   else
                     unsaved_issues << orig_issue
                   end
                 end
                 if unsaved_issues.empty?
                   flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
                   if params[:follow]
                     if @issues.size == 1 && saved_issues.size == 1
                       redirect_to issue_path(saved_issues.first)
                     elsif saved_issues.map(&:project).uniq.size == 1
                       redirect_to project_issues_path(saved_issues.map(&:project).first)
                     end
                   else
                     redirect_back_or_default _project_issues_path(@project)
                   end
                 else
                   @saved_issues = @issues
                   @unsaved_issues = unsaved_issues
                   @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a
                   bulk_edit
                   render :action => 'bulk_edit'
                 end
               end
               def destroy
                 @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.where(['issue_id IN (?)', @issues]).
                         update_all("issue_id = #{reassign_to.id}")
                     end
                   else
                     # display the destroy form if it's a user request
                     return unless api_request?
                   end
                 end
                 @issues.each do |issue|
                   begin
                     issue.reload.destroy
                   rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
                     # nothing to do, issue was already deleted (eg. by a parent)
                   end
                 end
                 respond_to do |format|
                   format.html { redirect_back_or_default _project_issues_path(@project) }
                   format.api  { render_api_ok }
                 end
               end
               private
               def find_project
                 project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
                 @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_previous_and_next_issue_ids
                 retrieve_query_from_session
                 if @query
                   sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                   sort_update(@query.sortable_columns, 'issues_index_sort')
                   limit = 500
                   issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
                   if (idx = issue_ids.index(@issue.id)) && idx < limit
                     if issue_ids.size < 500
                       @issue_position = idx + 1
                       @issue_count = issue_ids.size
                     end
                     @prev_issue_id = issue_ids[idx - 1] if idx > 0
                     @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
                   end
                 end
               end
               # Used by #edit and #update to set some common instance variables
               # from the params
               # TODO: Refactor, not everything in here is needed by #edit
               def update_issue_from_params
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 if params[:time_entry]
                   @time_entry.attributes = params[:time_entry]
                 end
                 @issue.init_journal(User.current)
                 issue_attributes = params[:issue]
                 if issue_attributes && params[:conflict_resolution]
                   case params[:conflict_resolution]
                   when 'overwrite'
                     issue_attributes = issue_attributes.dup
                     issue_attributes.delete(:lock_version)
                   when 'add_notes'
                     issue_attributes = issue_attributes.slice(:notes)
                   when 'cancel'
                     redirect_to issue_path(@issue)
                     return false
                   end
                 end
                 @issue.safe_attributes = issue_attributes
                 @priorities = IssuePriority.active
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 true
               end
               # TODO: Refactor, lots of extra code in here
               # TODO: Changing tracker on an existing issue should not trigger this
               def build_new_issue_from_params
                 if params[:id].blank?
                   @issue = Issue.new
                   if params[:copy_from]
                     begin
                       @issue.init_journal(User.current)
                       @copy_from = Issue.visible.find(params[:copy_from])
                       unless User.current.allowed_to?(:copy_issues, @copy_from.project)
                         raise ::Unauthorized
                       end
                       @link_copy = link_copy?(params[:link_copy]) || request.get?
                       @copy_attachments = params[:copy_attachments].present? || request.get?
                       @copy_subtasks = params[:copy_subtasks].present? || request.get?
                       @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy)
                     rescue ActiveRecord::RecordNotFound
                       render_404
                       return
                     end
                   end
                   @issue.project = @project
                   @issue.author ||= User.current
                   @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
                 else
                   @issue = @project.issues.visible.find(params[:id])
                 end
                 if attrs = params[:issue].deep_dup
                   if params[:was_default_status] == attrs[:status_id]
                     attrs.delete(:status_id)
                   end
                   @issue.safe_attributes = attrs
                 end
                 @issue.tracker ||= @project.trackers.first
                 if @issue.tracker.nil?
                   render_error l(:error_no_tracker_in_project)
                   return false
                 end
                 if @issue.status.nil?
                   render_error l(:error_no_default_issue_status)
                   return false
                 end
                 @priorities = IssuePriority.active
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
-                @available_watchers = @issue.watcher_users
-                if @issue.project.users.count <= 20
-                  @available_watchers = (@available_watchers + @issue.project.users.sort).uniq
-                end
               end
               def parse_params_for_bulk_issue_attributes(params)
                 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
                 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                 if custom = attributes[:custom_field_values]
                   custom.reject! {|k,v| v.blank?}
                   custom.keys.each do |k|
                     if custom[k].is_a?(Array)
                       custom[k] << '' if custom[k].delete('__none__')
                     else
                       custom[k] = '' if custom[k] == '__none__'
                     end
                   end
                 end
                 attributes
               end
               # Saves @issue and a time_entry from the parameters
               def save_issue_with_child_records
                 Issue.transaction do
                   if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
                     time_entry = @time_entry || TimeEntry.new
                     time_entry.project = @issue.project
                     time_entry.issue = @issue
                     time_entry.user = User.current
                     time_entry.spent_on = User.current.today
                     time_entry.attributes = params[:time_entry]
                     @issue.time_entries << time_entry
                   end
                   call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
                   if @issue.save
                     call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
                   else
                     raise ActiveRecord::Rollback
                   end
                 end
               end
               def link_copy?(param)
                 case Setting.link_copied_issue
                 when 'yes'
                   true
                 when 'no'
                   false
                 when 'ask'
                   param == '1'
                 end
               end
             end

app/helpers/issues_helper.rb +10 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 previous_group, first = false, true
                 issue_list(issues) do |issue, level|
                   group_name = group_count = nil
                   if query.grouped? && ((group = query.group_by_column.value(issue)) != previous_group || first)
                     if group.blank? && group != false
                       group_name = "(#{l(:label_blank_value)})"
                     else
                       group_name = column_content(query.group_by_column, issue)
                     end
                     group_name ||= ""
                     group_count = issue_count_by_group[group]
                   end
                   yield issue, level, group_name, group_count
                   previous_group, first = group, false
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :tracker_id => issue.tracker,
                   :parent_issue_id => issue
                 }
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   html = ''.html_safe
                   blank = content_tag('th', '') + content_tag('td', '')
                   size.times do |i|
                     left = @left[i] || blank
                     right = @right[i] || blank
                     html << content_tag('tr', left + right)
                   end
                   html
                 end
                 def cells(label, text, options={})
                   content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 ordered_values = []
                 half = (values.size / 2.0).ceil
                 half.times do |i|
                   ordered_values << values[i]
                   ordered_values << values[i + half]
                 end
                 s = "<tr>\n"
                 n = 0
                 ordered_values.compact.each do |value|
                   css = "cf_#{value.custom_field.id}"
                   s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                   s << "\t<th class=\"#{css}\">#{ h(value.custom_field.name) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"
                 s.html_safe
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
             		descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
+              # Returns an array of users that are proposed as watchers
+              # on the new issue form
+              def users_for_new_issue_watchers(issue)
+                users = issue.watcher_users
+                if issue.project.users.count <= 20
+                  users = (users + issue.project.users.sort).uniq
+                end
+                users
+              end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     to_a
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 values_by_field.each do |field, changes|
                   detail = JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s)
                   detail.instance_variable_set "@custom_field", field
                   if changes[:added].any?
                     detail.value = changes[:added]
                     strings << show_detail(detail, no_html, options)
                   elsif changes[:deleted].any?
                     detail.old_value = changes[:deleted]
                     strings << show_detail(detail, no_html, options)
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
                     if custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && atta.is_text?
                       value += link_to(
                                    image_tag('magnifier.png'),
                                    :controller => 'attachments', :action => 'show',
                                    :id => atta, :filename => atta.filename
                                  )
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                        :detail_id => detail.id, :only_path => options[:only_path]},
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       record.name.force_encoding('UTF-8')
                       hash[key] = record.name
                     end
                   end
                   hash[key] ||= nil
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/views/issues/new.html.erb +1 -1

             <%= title l(:label_issue_new) %>
             <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>
             <%= labelled_form_for @issue, :url => project_issues_path(@project),
                                          :html => {:id => 'issue-form', :multipart => true} do |f| %>
               <%= error_messages_for 'issue' %>
               <%= hidden_field_tag 'copy_from', params[:copy_from] if params[:copy_from] %>
               <div class="box tabular">
                 <div id="all_attributes">
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
                 </div>
                 <% if @copy_from && Setting.link_copied_issue == 'ask' %>
                 <p>
                   <label for="link_copy"><%= l(:label_link_copied_issue) %></label>
                   <%= check_box_tag 'link_copy', '1', @link_copy %>
                 </p>
                 <% end %>
                 <% if @copy_from && @copy_from.attachments.any? %>
                 <p>
                   <label for="copy_attachments"><%= l(:label_copy_attachments) %></label>
                   <%= check_box_tag 'copy_attachments', '1', @copy_attachments %>
                 </p>
                 <% end %>
                 <% if @copy_from && !@copy_from.leaf? %>
                 <p>
                   <label for="copy_subtasks"><%= l(:label_copy_subtasks) %></label>
                   <%= check_box_tag 'copy_subtasks', '1', @copy_subtasks %>
                 </p>
                 <% end %>
                 <p id="attachments_form"><label><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
                 <% if @issue.safe_attribute? 'watcher_user_ids' -%>
                   <p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
                   <span id="watchers_inputs">
-                    <%= watchers_checkboxes(@issue, @available_watchers) %>
+                    <%= watchers_checkboxes(@issue, users_for_new_issue_watchers(@issue)) %>
                   </span>
                   <span class="search_for_watchers">
                   <%= link_to l(:label_search_for_watchers),
                               {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
                               :remote => true,
                               :method => 'get' %>
                   </span>
                   </p>
                 <% end %>
               </div>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
               <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
                 <%= robot_exclusion_tag %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages