jro_apps/redmine Commit - r3909:519069b8675f

Merged r4011 from trunk....

Eric Davis -

r3909:519069b8675f

parent child

Context file:

r3909:519069b8675f

Collapse all files

app/controllers/issues_controller.rb +13 -18

                before_filter :find_issue, :only => [:show, :edit, :update]
                before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
-               before_filter :find_project, :only => [:new, :create, :update_form]
+               before_filter :find_project, :only => [:new, :create]
                before_filter :authorize, :except => [:index, :changes]
                before_filter :find_optional_project, :only => [:index, :changes]
                before_filter :check_for_default_issue_status, :only => [:new, :create]
                # Add a new issue
                # The new issue will be created from an existing one if copy_from parameter is given
                def new
-                 render :action => 'new', :layout => !request.xhr?
+                 respond_to do |format|
+                   format.html { render :action => 'new', :layout => !request.xhr? }
+                   format.js { render :partial => 'attributes' }
+                 end
                end
                def create
                  end
                end
-               def update_form
-                 if params[:id].blank?
-                   @issue = Issue.new
-                   @issue.project = @project
-                 else
-                   @issue = @project.issues.visible.find(params[:id])
-                 end
-                 @issue.attributes = params[:issue]
-                 @allowed_statuses = ([@issue.status] + @issue.status.find_new_statuses_allowed_to(User.current.roles_for_project(@project), @issue.tracker)).uniq
-                 @priorities = IssuePriority.all
-                 render :partial => 'attributes'
-               end
              private
                def find_issue
                  @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                # TODO: Refactor, lots of extra code in here
                def build_new_issue_from_params
-                 @issue = Issue.new
-                 @issue.copy_from(params[:copy_from]) if params[:copy_from]
+                 if params[:id].blank?
+                   @issue = Issue.new
+                   @issue.copy_from(params[:copy_from]) if params[:copy_from]
+                   @issue.project = @project
+                 else
+                   @issue = @project.issues.visible.find(params[:id])
+                 end
                  @issue.project = @project
                  # Tracker must be set before custom field values
                  @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)

app/views/issues/_form.rhtml +1 -1

              <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
              <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
-             <%= observe_field :issue_tracker_id, :url => { :action => :update_form, :project_id => @project, :id => @issue },
+             <%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
                                                   :update => :attributes,
                                                   :with => "Form.serialize('issue-form')" %>

test/functional/issues_controller_test.rb +2 -2

                def test_update_new_form
                  @request.session[:user_id] = 2
-                 xhr :post, :update_form, :project_id => 1,
+                 xhr :post, :new, :project_id => 1,
                                   :issue => {:tracker_id => 2,
                                              :subject => 'This is the test_new issue',
                                              :description => 'This is the description',
                def test_update_edit_form
                  @request.session[:user_id] = 2
-                 xhr :post, :update_form, :project_id => 1,
+                 xhr :post, :new, :project_id => 1,
                                           :id => 1,
                                           :issue => {:tracker_id => 2,
                                                      :subject => 'This is the test_new issue',

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