jro_apps/redmine Commit - r11175:7799788b3de6

Fixed that updating the issue form was broken by r4011 when user is not allowed to add issues (#13188)....

Jean-Philippe Lang -

r11175:7799788b3de6

parent child

Context file:

r11175:7799788b3de6

Collapse all files

app/controllers/issues_controller.rb +7 -3

                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]
+               before_filter :find_project, :only => [:new, :create, :update_form]
                before_filter :authorize, :except => [:index]
                before_filter :find_optional_project, :only => [:index]
                before_filter :check_for_default_issue_status, :only => [:new, :create]
-               before_filter :build_new_issue_from_params, :only => [:new, :create]
+               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
                def new
                  respond_to do |format|
                    format.html { render :action => 'new', :layout => !request.xhr? }
-                   format.js { render :partial => 'update_form' }
                  end
                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!

app/views/issues/update_form.js.erb ~~app/views/issues/_update_form.js.erb~~ renamed 0 0

NO CONTENT: file renamed from app/views/issues/_update_form.js.erb to app/views/issues/update_form.js.erb

config/routes.rb +1 -1

                    end
                  end
                  # issue form update
-                 match 'issues/new', :controller => 'issues', :action => 'new', :via => [:put, :post], :as => 'issue_form'
+                 match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
                  resources :files, :only => [:index, :new, :create]

lib/redmine.rb +1 -1

                  map.permission :manage_subtasks, {}
                  map.permission :set_issues_private, {}
                  map.permission :set_own_issues_private, {}, :require => :loggedin
-                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new], :attachments => :upload}
+                 map.permission :add_issue_notes, {:issues => [:edit, :update, :update_form], :journals => [:new], :attachments => :upload}
                  map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :view_private_notes, {}, :read => true, :require => :member

test/fixtures/users.yml +5 -2

                login: ''
                type: AnonymousUser
              users_007:
+               # A user who does not belong to any project
                id: 7
                created_on: 2006-07-19 19:33:19 +02:00
                status: 1
                last_login_on:
-               language: ''
-               hashed_password: 1
+               language: 'en'
+               # password = foo
+               salt: 7599f9963ec07b5a3b55b354407120c0
+               hashed_password: 8f659c8d7c072f189374edacfa90d6abbc26d8ed
                updated_on: 2006-07-19 19:33:19 +02:00
                admin: false
                mail: someone@foo.bar

test/functional/issues_controller_test.rb +12 -12

                  assert_error_tag :content => /No tracker/
                end
-               def test_update_new_form
+               def test_update_form_for_new_issue
                  @request.session[:user_id] = 2
-                 xhr :post, :new, :project_id => 1,
+                 xhr :post, :update_form, :project_id => 1,
                                   :issue => {:tracker_id => 2,
                                              :subject => 'This is the test_new issue',
                                              :description => 'This is the description',
                  assert_equal 'This is the test_new issue', issue.subject
                end
-               def test_update_new_form_should_propose_transitions_based_on_initial_status
+               def test_update_form_for_new_issue_should_propose_transitions_based_on_initial_status
                  @request.session[:user_id] = 2
                  WorkflowTransition.delete_all
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 2)
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 1, :new_status_id => 5)
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4)
-                 xhr :post, :new, :project_id => 1,
+                 xhr :post, :update_form, :project_id => 1,
                                   :issue => {:tracker_id => 1,
                                              :status_id => 5,
                                              :subject => 'This is an issue'}
                  end
                end
-               def test_update_edit_form
+               def test_update_form_for_existing_issue
                  @request.session[:user_id] = 2
-                 xhr :put, :new, :project_id => 1,
+                 xhr :put, :update_form, :project_id => 1,
                                           :id => 1,
                                           :issue => {:tracker_id => 2,
                                                      :subject => 'This is the test_new issue',
                  assert_equal 'This is the test_new issue', issue.subject
                end
-               def test_update_edit_form_should_keep_issue_author
+               def test_update_form_for_existing_issue_should_keep_issue_author
                  @request.session[:user_id] = 3
-                 xhr :put, :new, :project_id => 1, :id => 1, :issue => {:subject => 'Changed'}
+                 xhr :put, :update_form, :project_id => 1, :id => 1, :issue => {:subject => 'Changed'}
                  assert_response :success
                  assert_equal 'text/javascript', response.content_type
                  assert_not_equal User.current, issue.author
                end
-               def test_update_edit_form_should_propose_transitions_based_on_initial_status
+               def test_update_form_for_existing_issue_should_propose_transitions_based_on_initial_status
                  @request.session[:user_id] = 2
                  WorkflowTransition.delete_all
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 1)
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 2, :new_status_id => 5)
                  WorkflowTransition.create!(:role_id => 1, :tracker_id => 2, :old_status_id => 5, :new_status_id => 4)
-                 xhr :put, :new, :project_id => 1,
+                 xhr :put, :update_form, :project_id => 1,
                                  :id => 2,
                                  :issue => {:tracker_id => 2,
                                             :status_id => 5,
                  assert_equal [1,2,5], assigns(:allowed_statuses).map(&:id).sort
                end
-               def test_update_edit_form_with_project_change
+               def test_update_form_for_existing_issue_with_project_change
                  @request.session[:user_id] = 2
-                 xhr :put, :new, :project_id => 1,
+                 xhr :put, :update_form, :project_id => 1,
                                           :id => 1,
                                           :issue => {:project_id => 2,
                                                      :tracker_id => 2,

test/integration/issues_test.rb 0 -9

                  assert_equal 1, issue.status.id
                end
-               def test_update_issue_form
-                 log_user('jsmith', 'jsmith')
-                 post 'projects/ecookbook/issues/new', :issue => { :tracker_id => "2"}
-                 assert_response :success
-                 assert_tag 'select',
-                   :attributes => {:name => 'issue[tracker_id]'},
-                   :child => {:tag => 'option', :attributes => {:value => '2', :selected => 'selected'}}
-               end
                # add then remove 2 attachments to an issue
                def test_issue_attachments
                  log_user('jsmith', 'jsmith')

test/integration/routing/issues_test.rb +2 -2

                def test_issues_form_update
                  ["post", "put"].each do |method|
                    assert_routing(
-                       { :method => method, :path => "/projects/23/issues/new" },
-                       { :controller => 'issues', :action => 'new', :project_id => '23' }
+                       { :method => method, :path => "/projects/23/issues/update_form" },
+                       { :controller => 'issues', :action => 'update_form', :project_id => '23' }
                      )
                  end
                end

test/ui/issues_test.rb +58 0

		@@ -56,6 +56,35 class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
56	56	assert_equal 'Value for field 2', issue.custom_field_value(CustomField.find_by_name('Searchable field'))
57	57	end
58	58
	59	def test_create_issue_with_form_update
	60	field = IssueCustomField.create!(
	61	:field_format => 'string',
	62	:name => 'Form update CF',
	63	:is_for_all => true,
	64	:trackers => Tracker.find_all_by_name('Feature request')
	65	)
	66
	67	Role.non_member.add_permission! :add_issues
	68	Role.non_member.remove_permission! :edit_issues, :add_issue_notes
	69
	70	log_user('someone', 'foo')
	71	visit '/projects/ecookbook/issues/new'
	72	assert page.has_no_content?('Form update CF')
	73
	74	fill_in 'Subject', :with => 'new test issue'
	75	# the custom field should show up when changing tracker
	76	select 'Feature request', :from => 'Tracker'
	77	assert page.has_content?('Form update CF')
	78
	79	fill_in 'Form update', :with => 'CF value'
	80	assert_difference 'Issue.count' do
	81	find('input[name=commit]').click
	82	end
	83
	84	issue = Issue.order('id desc').first
	85	assert_equal 'CF value', issue.custom_field_value(field)
	86	end
	87
59	88	def test_create_issue_with_watchers
60	89	User.generate!(:firstname => 'Some', :lastname => 'Watcher')
61	90
		@@ -98,6 +127,35 class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
98	127	assert_equal 'new issue description', issue.description
99	128	end
100	129
	130	def test_update_issue_with_form_update
	131	field = IssueCustomField.create!(
	132	:field_format => 'string',
	133	:name => 'Form update CF',
	134	:is_for_all => true,
	135	:trackers => Tracker.find_all_by_name('Feature request')
	136	)
	137
	138	Role.non_member.add_permission! :edit_issues
	139	Role.non_member.remove_permission! :add_issues, :add_issue_notes
	140
	141	log_user('someone', 'foo')
	142	visit '/issues/1'
	143	assert page.has_no_content?('Form update CF')
	144
	145	page.first(:link, 'Update').click
	146	# the custom field should show up when changing tracker
	147	select 'Feature request', :from => 'Tracker'
	148	assert page.has_content?('Form update CF')
	149
	150	fill_in 'Form update', :with => 'CF value'
	151	assert_no_difference 'Issue.count' do
	152	page.first(:button, 'Submit').click
	153	end
	154
	155	issue = Issue.find(1)
	156	assert_equal 'CF value', issue.custom_field_value(field)
	157	end
	158
101	159	def test_watch_issue_via_context_menu
102	160	log_user('jsmith', 'jsmith')
103	161	visit '/issues'

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