jro_apps/redmine Commit - r14406:fb8e348254a2

Set default project version after selecting a different project on the new issue form (#1828)....

Jean-Philippe Lang -

r14406:fb8e348254a2

parent child

Context file:

r14406:fb8e348254a2

Collapse all files

The requested changes are too big and content was truncated. Show full diff

app/controllers/issues_controller.rb +5 0

             # 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 :authorize, :except => [:index, :new, :create]
               before_filter :find_optional_project, :only => [:index, :new, :create]
               before_filter :build_new_issue_from_params, :only => [:new, :create]
               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
               helper :custom_fields
               helper :issue_relations
               helper :watchers
               helper :attachments
               helper :queries
               include QueriesHelper
               helper :repositories
               helper :sort
               include SortHelper
               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[:csv]), :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(:created_on, :id).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.preload(:repository, :user).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)
                 @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
               def new
                 respond_to do |format|
                   format.html { render :action => 'new', :layout => !request.xhr? }
                   format.js
                 end
               end
               def create
                 unless User.current.allowed_to?(:add_issues, @issue.project, :global => true)
                   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))
                       redirect_after_create
                     }
                     format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
                   end
                   return
                 else
                   respond_to do |format|
                     format.html {
                       if @issue.project.nil?
                         render_error :status => 422
                       else
                         render :action => 'new'
                       end
                     }
                     format.api  { render_validation_errors(@issue) }
                   end
                 end
               end
               def edit
                 return unless update_issue_from_params
                 respond_to do |format|
                   format.html { }
                   format.js
                 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
               # 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 = @issues.map{|i|i.editable_custom_fields}.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)
                 copy_subtasks = (params[:copy_subtasks] == '1')
                 copy_attachments = (params[:copy_attachments] == '1')
                 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 && copy_subtasks
                   # 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 => copy_attachments,
                       :subtasks => copy_subtasks,
                       :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 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
               def update_issue_from_params
                 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
                 if params[:time_entry]
                   @time_entry.safe_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
               # Used by #new and #create to build a new issue from the params
               # The new issue will be copied from an existing one if copy_from parameter is given
               def build_new_issue_from_params
                 @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
                 if request.get?
                   @issue.project ||= @issue.allowed_target_projects.first
                 end
                 @issue.author ||= User.current
                 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
                 attrs = (params[:issue] || {}).deep_dup
                 if action_name == 'new' && params[:was_default_status] == attrs[:status_id]
                   attrs.delete(:status_id)
                 end
+                if action_name == 'new' && params[:form_update_triggered_by] == 'issue_project_id'
+                  # Discard submitted version when changing the project on the issue form
+                  # so we can use the default version for the new project
+                  attrs.delete(:fixed_version_id)
+                end
                 @issue.safe_attributes = attrs
                 if @issue.project
                   @issue.tracker ||= @issue.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
                 end
                 @priorities = IssuePriority.active
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
               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
               # Returns true if the issue copy should be linked
               # to the original issue
               def link_copy?(param)
                 case Setting.link_copied_issue
                 when 'yes'
                   true
                 when 'no'
                   false
                 when 'ask'
                   param == '1'
                 end
               end
               # Redirects user after a successful issue creation
               def redirect_after_create
                 if params[:continue]
                   attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
                   if params[:project_id]
                     redirect_to new_project_issue_path(@issue.project, :issue => attrs)
                   else
                     attrs.merge! :project_id => @issue.project_id
                     redirect_to new_issue_path(:issue => attrs)
                   end
                 else
                   redirect_to issue_path(@issue)
                 end
               end
             end

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

             <%= labelled_fields_for :issue, @issue do |f| %>
             <div class="splitcontent">
             <div class="splitcontentleft">
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
             <% end %>
             <% if @issue.safe_attribute? 'priority_id' %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true} %></p>
             <% end %>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
             <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
             <% end %>
             <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
             <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %>
             <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
                         new_project_issue_category_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_issue_category_new),
                         :tabindex => 200) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
             <% end %>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
             <%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'),
                         new_project_version_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_version_new),
                         :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
             <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>
             <p id="start_date_area">
               <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
               <%= calendar_for('issue_start_date') if @issue.leaf? %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p id="due_date_area">
               <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
               <%= calendar_for('issue_due_date') if @issue.leaf? %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'estimated_hours' %>
             <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
             <% end %>
             <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
             <% end %>
             </div>
             </div>
             <% if @issue.safe_attribute? 'custom_field_values' %>
             <%= render :partial => 'issues/form_custom_fields' %>
             <% end %>
             <% end %>
             <% include_calendar_headers_tags %>

app/views/issues/_form.html.erb +3 -2

             <%= labelled_fields_for :issue, @issue do |f| %>
             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+            <%= hidden_field_tag 'form_update_triggered_by', '' %>
             <% if @issue.safe_attribute? 'is_private' %>
             <p id="issue_is_private_wrap">
               <%= f.check_box :is_private, :no_label => true %><label class="inline" for="issue_is_private" id="issue_is_private_label"><%= l(:field_is_private) %></label>
             </p>
             <% end %>
             <% if @issue.safe_attribute?('project_id') && (!@issue.new_record? || @project.nil? || @issue.copy?) %>
             <p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <% end %>
             <% if @issue.safe_attribute? 'tracker_id' %>
             <p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <% end %>
             <% if @issue.safe_attribute? 'subject' %>
             <p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true %></p>
             <% end %>
             <% if @issue.safe_attribute? 'description' %>
             <p>
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %>
               <%= link_to_function content_tag(:span, l(:button_edit), :class => 'icon icon-edit'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
               <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
                 <%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit',
                                :no_label => true %>
               <% end %>
             </p>
             <%= wikitoolbar_for 'issue_description' %>
             <% end %>
             <div id="attributes" class="attributes">
               <%= render :partial => 'issues/attributes' %>
             </div>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <% end %>
             <% heads_for_wiki_formatter %>
             <%= javascript_tag do %>
             $(document).ready(function(){
               $("#issue_tracker_id, #issue_status_id").each(function(){
                 $(this).val($(this).find("option[selected=selected]").val());
               });
             });
             <% end %>

public/javascripts/application.js +4 -1

             /* Redmine - project management software
                Copyright (C) 2006-2015  Jean-Philippe Lang */
             function checkAll(id, checked) {
               $('#'+id).find('input[type=checkbox]:enabled').prop('checked', checked);
             }
             function toggleCheckboxesBySelector(selector) {
               var all_checked = true;
               $(selector).each(function(index) {
                 if (!$(this).is(':checked')) { all_checked = false; }
               });
               $(selector).prop('checked', !all_checked);
             }
             function showAndScrollTo(id, focus) {
               $('#'+id).show();
               if (focus !== null) {
                 $('#'+focus).focus();
               }
               $('html, body').animate({scrollTop: $('#'+id).offset().top}, 100);
             }
             function toggleRowGroup(el) {
               var tr = $(el).parents('tr').first();
               var n = tr.next();
               tr.toggleClass('open');
               while (n.length && !n.hasClass('group')) {
                 n.toggle();
                 n = n.next('tr');
               }
             }
             function collapseAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).removeClass('open');
                 } else {
                   $(this).hide();
                 }
               });
             }
             function expandAllRowGroups(el) {
               var tbody = $(el).parents('tbody').first();
               tbody.children('tr').each(function(index) {
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
             }
             function toggleAllRowGroups(el) {
               var tr = $(el).parents('tr').first();
               if (tr.hasClass('open')) {
                 collapseAllRowGroups(el);
               } else {
                 expandAllRowGroups(el);
               }
             }
             function toggleFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').toggle();
             }
             function hideFieldset(el) {
               var fieldset = $(el).parents('fieldset').first();
               fieldset.toggleClass('collapsed');
               fieldset.children('div').hide();
             }
             // columns selection
             function moveOptions(theSelFrom, theSelTo) {
               $(theSelFrom).find('option:selected').detach().prop("selected", false).appendTo($(theSelTo));
             }
             function moveOptionUp(theSel) {
               $(theSel).find('option:selected').each(function(){
                 $(this).prev(':not(:selected)').detach().insertAfter($(this));
               });
             }
             function moveOptionTop(theSel) {
               $(theSel).find('option:selected').detach().prependTo($(theSel));
             }
             function moveOptionDown(theSel) {
               $($(theSel).find('option:selected').get().reverse()).each(function(){
                 $(this).next(':not(:selected)').detach().insertBefore($(this));
               });
             }
             function moveOptionBottom(theSel) {
               $(theSel).find('option:selected').detach().appendTo($(theSel));
             }
             function initFilters() {
               $('#add_filter_select').change(function() {
                 addFilter($(this).val(), '', []);
               });
               $('#filters-table td.field input[type=checkbox]').each(function() {
                 toggleFilter($(this).val());
               });
               $('#filters-table').on('click', 'td.field input[type=checkbox]', function() {
                 toggleFilter($(this).val());
               });
               $('#filters-table').on('click', '.toggle-multiselect', function() {
                 toggleMultiSelect($(this).siblings('select'));
               });
               $('#filters-table').on('keypress', 'input[type=text]', function(e) {
                 if (e.keyCode == 13) $(this).closest('form').submit();
               });
             }
             function addFilter(field, operator, values) {
               var fieldId = field.replace('.', '_');
               var tr = $('#tr_'+fieldId);
               if (tr.length > 0) {
                 tr.show();
               } else {
                 buildFilterRow(field, operator, values);
               }
               $('#cb_'+fieldId).prop('checked', true);
               toggleFilter(field);
               $('#add_filter_select').val('').find('option').each(function() {
                 if ($(this).attr('value') == field) {
                   $(this).attr('disabled', true);
                 }
               });
             }
             function buildFilterRow(field, operator, values) {
               var fieldId = field.replace('.', '_');
               var filterTable = $("#filters-table");
               var filterOptions = availableFilters[field];
               if (!filterOptions) return;
               var operators = operatorByType[filterOptions['type']];
               var filterValues = filterOptions['values'];
               var i, select;
               var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
                 '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
                 '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
                 '<td class="values"></td>'
               );
               filterTable.append(tr);
               select = tr.find('td.operator select');
               for (i = 0; i < operators.length; i++) {
                 var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
                 if (operators[i] == operator) { option.attr('selected', true); }
                 select.append(option);
               }
               select.change(function(){ toggleOperator(field); });
               switch (filterOptions['type']) {
               case "list":
               case "list_optional":
               case "list_status":
               case "list_subprojects":
                 tr.find('td.values').append(
                   '<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
                   ' <span class="toggle-multiselect">&nbsp;</span></span>'
                 );
                 select = tr.find('td.values select');
                 if (values.length > 1) { select.attr('multiple', true); }
                 for (i = 0; i < filterValues.length; i++) {
                   var filterValue = filterValues[i];
                   var option = $('<option>');
                   if ($.isArray(filterValue)) {
                     option.val(filterValue[1]).text(filterValue[0]);
                     if ($.inArray(filterValue[1], values) > -1) {option.attr('selected', true);}
                   } else {
                     option.val(filterValue).text(filterValue);
                     if ($.inArray(filterValue, values) > -1) {option.attr('selected', true);}
                   }
                   select.append(option);
                 }
                 break;
               case "date":
               case "date_past":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="10" class="value date_value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="10" class="value date_value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="3" class="value" /> '+labelDayPlural+'</span>'
                 );
                 $('#values_'+fieldId+'_1').val(values[0]).datepicker(datepickerOptions);
                 $('#values_'+fieldId+'_2').val(values[1]).datepicker(datepickerOptions);
                 $('#values_'+fieldId).val(values[0]);
                 break;
               case "string":
               case "text":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="30" class="value" /></span>'
                 );
                 $('#values_'+fieldId).val(values[0]);
                 break;
               case "relation":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'" size="6" class="value" /></span>' +
                   '<span style="display:none;"><select class="value" name="v['+field+'][]" id="values_'+fieldId+'_1"></select></span>'
                 );
                 $('#values_'+fieldId).val(values[0]);
                 select = tr.find('td.values select');
                 for (i = 0; i < allProjects.length; i++) {
                   var filterValue = allProjects[i];
                   var option = $('<option>');
                   option.val(filterValue[1]).text(filterValue[0]);
                   if (values[0] == filterValue[1]) { option.attr('selected', true); }
                   select.append(option);
                 }
                 break;
               case "integer":
               case "float":
               case "tree":
                 tr.find('td.values').append(
                   '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="6" class="value" /></span>' +
                   ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="6" class="value" /></span>'
                 );
                 $('#values_'+fieldId+'_1').val(values[0]);
                 $('#values_'+fieldId+'_2').val(values[1]);
                 break;
               }
             }
             function toggleFilter(field) {
               var fieldId = field.replace('.', '_');
               if ($('#cb_' + fieldId).is(':checked')) {
                 $("#operators_" + fieldId).show().removeAttr('disabled');
                 toggleOperator(field);
               } else {
                 $("#operators_" + fieldId).hide().attr('disabled', true);
                 enableValues(field, []);
               }
             }
             function enableValues(field, indexes) {
               var fieldId = field.replace('.', '_');
               $('#tr_'+fieldId+' td.values .value').each(function(index) {
                 if ($.inArray(index, indexes) >= 0) {
                   $(this).removeAttr('disabled');
                   $(this).parents('span').first().show();
                 } else {
                   $(this).val('');
                   $(this).attr('disabled', true);
                   $(this).parents('span').first().hide();
                 }
                 if ($(this).hasClass('group')) {
                   $(this).addClass('open');
                 } else {
                   $(this).show();
                 }
               });
             }
             function toggleOperator(field) {
               var fieldId = field.replace('.', '_');
               var operator = $("#operators_" + fieldId);
               switch (operator.val()) {
                 case "!*":
                 case "*":
                 case "t":
                 case "ld":
                 case "w":
                 case "lw":
                 case "l2w":
                 case "m":
                 case "lm":
                 case "y":
                 case "o":
                 case "c":
                   enableValues(field, []);
                   break;
                 case "><":
                   enableValues(field, [0,1]);
                   break;
                 case "<t+":
                 case ">t+":
                 case "><t+":
                 case "t+":
                 case ">t-":
                 case "<t-":
                 case "><t-":
                 case "t-":
                   enableValues(field, [2]);
                   break;
                 case "=p":
                 case "=!p":
                 case "!p":
                   enableValues(field, [1]);
                   break;
                 default:
                   enableValues(field, [0]);
                   break;
               }
             }
             function toggleMultiSelect(el) {
               if (el.attr('multiple')) {
                 el.removeAttr('multiple');
                 el.attr('size', 1);
               } else {
                 el.attr('multiple', true);
                 if (el.children().length > 10)
                   el.attr('size', 10);
                 else
                   el.attr('size', 4);
               }
             }
             function showTab(name, url) {
               $('#tab-content-' + name).parent().find('.tab-content').hide();
               $('#tab-content-' + name).parent().find('div.tabs a').removeClass('selected');
               $('#tab-content-' + name).show();
               $('#tab-' + name).addClass('selected');
               //replaces current URL with the "href" attribute of the current link
               //(only triggered if supported by browser)
               if ("replaceState" in window.history) {
                 window.history.replaceState(null, document.title, url);
               }
               return false;
             }
             function moveTabRight(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var tabsWidth = 0;
               var i = 0;
               lis.each(function() {
                 if ($(this).is(':visible')) {
                   tabsWidth += $(this).width() + 6;
                 }
               });
               if (tabsWidth < $(el).parents('div.tabs').first().width() - 60) { return; }
               while (i<lis.length && !lis.eq(i).is(':visible')) { i++; }
               lis.eq(i).hide();
             }
             function moveTabLeft(el) {
               var lis = $(el).parents('div.tabs').first().find('ul').children();
               var i = 0;
               while (i < lis.length && !lis.eq(i).is(':visible')) { i++; }
               if (i > 0) {
                 lis.eq(i-1).show();
               }
             }
             function displayTabsButtons() {
               var lis;
               var tabsWidth;
               var el;
               $('div.tabs').each(function() {
                 el = $(this);
                 lis = el.find('ul').children();
                 tabsWidth = 0;
                 lis.each(function(){
                   if ($(this).is(':visible')) {
                     tabsWidth += $(this).width() + 6;
                   }
                 });
                 if ((tabsWidth < el.width() - 60) && (lis.first().is(':visible'))) {
                   el.find('div.tabs-buttons').hide();
                 } else {
                   el.find('div.tabs-buttons').show();
                 }
               });
             }
             function setPredecessorFieldsVisibility() {
               var relationType = $('#relation_relation_type');
               if (relationType.val() == "precedes" || relationType.val() == "follows") {
                 $('#predecessor_fields').show();
               } else {
                 $('#predecessor_fields').hide();
               }
             }
             function showModal(id, width, title) {
               var el = $('#'+id).first();
               if (el.length === 0 || el.is(':visible')) {return;}
               if (!title) title = el.find('h3.title').text();
               // moves existing modals behind the transparent background
               $(".modal").zIndex(99);
               el.dialog({
                 width: width,
                 modal: true,
                 resizable: false,
                 dialogClass: 'modal',
                 title: title
               }).on('dialogclose', function(){
                 $(".modal").zIndex(101);
               });
               el.find("input[type=text], input[type=submit]").first().focus();
             }
             function hideModal(el) {
               var modal;
               if (el) {
                 modal = $(el).parents('.ui-dialog-content');
               } else {
                 modal = $('#ajax-modal');
               }
               modal.dialog("close");
             }
             function submitPreview(url, form, target) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#'+form).serialize(),
                 success: function(data){
                   $('#'+target).html(data);
                 }
               });
             }
             function collapseScmEntry(id) {
               $('.'+id).each(function() {
                 if ($(this).hasClass('open')) {
                   collapseScmEntry($(this).attr('id'));
                 }
                 $(this).hide();
               });
               $('#'+id).removeClass('open');
             }
             function expandScmEntry(id) {
               $('.'+id).each(function() {
                 $(this).show();
                 if ($(this).hasClass('loaded') && !$(this).hasClass('collapsed')) {
                   expandScmEntry($(this).attr('id'));
                 }
               });
               $('#'+id).addClass('open');
             }
             function scmEntryClick(id, url) {
                 var el = $('#'+id);
                 if (el.hasClass('open')) {
                     collapseScmEntry(id);
                     el.addClass('collapsed');
                     return false;
                 } else if (el.hasClass('loaded')) {
                     expandScmEntry(id);
                     el.removeClass('collapsed');
                     return false;
                 }
                 if (el.hasClass('loading')) {
                     return false;
                 }
                 el.addClass('loading');
                 $.ajax({
                   url: url,
                   success: function(data) {
                     el.after(data);
                     el.addClass('open').addClass('loaded').removeClass('loading');
                   }
                 });
                 return true;
             }
             function randomKey(size) {
               var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
               var key = '';
               for (var i = 0; i < size; i++) {
                 key += chars.charAt(Math.floor(Math.random() * chars.length));
               }
               return key;
             }
-            function updateIssueFrom(url) {
+            function updateIssueFrom(url, el) {
               $('#all_attributes input, #all_attributes textarea, #all_attributes select').each(function(){
                 $(this).data('valuebeforeupdate', $(this).val());
               });
+              if (el) {
+                $("#form_update_triggered_by").val($(el).attr('id'));
+              }
               return $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#issue-form').serialize()
               });
             }
             function replaceIssueFormWith(html){
               var replacement = $(html);
               $('#all_attributes input, #all_attributes textarea, #all_attributes select').each(function(){
                 var object_id = $(this).attr('id');
                 if (object_id && $(this).data('valuebeforeupdate')!=$(this).val()) {
                   replacement.find('#'+object_id).val($(this).val());
                 }
               });
               $('#all_attributes').empty();
               $('#all_attributes').prepend(replacement);
             }
             function updateBulkEditFrom(url) {
               $.ajax({
                 url: url,
                 type: 'post',
                 data: $('#bulk_edit_form').serialize()
               });
             }
             function observeAutocompleteField(fieldId, url, options) {
               $(document).ready(function() {
                 $('#'+fieldId).autocomplete($.extend({
                   source: url,
                   minLength: 2,
                   search: function(){$('#'+fieldId).addClass('ajax-loading');},
                   response: function(){$('#'+fieldId).removeClass('ajax-loading');}
                 }, options));
                 $('#'+fieldId).addClass('autocomplete');
               });
             }
             function observeSearchfield(fieldId, targetId, url) {
               $('#'+fieldId).each(function() {
                 var $this = $(this);
                 $this.addClass('autocomplete');
                 $this.attr('data-value-was', $this.val());
                 var check = function() {
                   var val = $this.val();
                   if ($this.attr('data-value-was') != val){
                     $this.attr('data-value-was', val);
                     $.ajax({
                       url: url,
                       type: 'get',
                       data: {q: $this.val()},
                       success: function(data){ if(targetId) $('#'+targetId).html(data); },
                       beforeSend: function(){ $this.addClass('ajax-loading'); },
                       complete: function(){ $this.removeClass('ajax-loading'); }
                     });
                   }
                 };
                 var reset = function() {
                   if (timer) {
                     clearInterval(timer);
                     timer = setInterval(check, 300);
                   }
                 };
                 var timer = setInterval(check, 300);
                 $this.bind('keyup click mousemove', reset);
               });
             }
             function beforeShowDatePicker(input, inst) {
               var default_date = null;
               switch ($(input).attr("id")) {
                 case "issue_start_date" :
                   if ($("#issue_due_date").size() > 0) {
                     default_date = $("#issue_due_date").val();
                   }
                   break;
                 case "issue_due_date" :
                   if ($("#issue_start_date").size() > 0) {
                     default_date = $("#issue_start_date").val();
                   }
                   break;
               }
               $(input).datepicker("option", "defaultDate", default_date);
             }
             function initMyPageSortable(list, url) {
               $('#list-'+list).sortable({
                 connectWith: '.block-receiver',
                 tolerance: 'pointer',
                 update: function(){
                   $.ajax({
                     url: url,
                     type: 'post',
                     data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
                   });
                 }
               });
               $("#list-top, #list-left, #list-right").disableSelection();
             }
             var warnLeavingUnsavedMessage;
             function warnLeavingUnsaved(message) {
               warnLeavingUnsavedMessage = message;
               $(document).on('submit', 'form', function(){
                 $('textarea').removeData('changed');
               });
               $(document).on('change', 'textarea', function(){
                 $(this).data('changed', 'changed');
               });
               window.onbeforeunload = function(){
                 var warn = false;
                 $('textarea').blur().each(function(){
                   if ($(this).data('changed')) {
                     warn = true;
                   }
                 });
                 if (warn) {return warnLeavingUnsavedMessage;}
               };
             }
             function setupAjaxIndicator() {
               $(document).bind('ajaxSend', function(event, xhr, settings) {
                 if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
                   $('#ajax-indicator').show();
                 }
               });
               $(document).bind('ajaxStop', function() {
                 $('#ajax-indicator').hide();
               });
             }
             function hideOnLoad() {
               $('.hol').hide();
             }
             function addFormObserversForDoubleSubmit() {
               $('form[method=post]').each(function() {
                 if (!$(this).hasClass('multiple-submit')) {
                   $(this).submit(function(form_submission) {
                     if ($(form_submission.target).attr('data-submitted')) {
                       form_submission.preventDefault();
                     } else {
                       $(form_submission.target).attr('data-submitted', true);
                     }
                   });
                 }
               });
             }
             function defaultFocus(){
               if (($('#content :focus').length == 0) && (window.location.hash == '')) {
                 $('#content input[type=text], #content textarea').first().focus();
               }
             }
             function blockEventPropagation(event) {
               event.stopPropagation();
               event.preventDefault();
             }
             function toggleDisabledOnChange() {
               var checked = $(this).is(':checked');
               $($(this).data('disables')).attr('disabled', checked);
               $($(this).data('enables')).attr('disabled', !checked);
             }
             function toggleDisabledInit() {
               $('input[data-disables], input[data-enables]').each(toggleDisabledOnChange);
             }
             $(document).ready(function(){
               $('#content').on('change', 'input[data-disables], input[data-enables]', toggleDisabledOnChange);
               toggleDisabledInit();
             });
             function keepAnchorOnSignIn(form){
               var hash = decodeURIComponent(self.document.location.hash);
               if (hash) {
                 if (hash.indexOf("#") === -1) {
                   hash = "#" + hash;
                 }
                 form.action = form.action + hash;
               }
               return true;
             }
             $(document).ready(setupAjaxIndicator);
             $(document).ready(hideOnLoad);
             $(document).ready(addFormObserversForDoubleSubmit);
             $(document).ready(defaultFocus);

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

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