##// END OF EJS Templates
Merged r5991 from trunk....
Jean-Philippe Lang -
r6038:2325831d81a3
parent child
Show More
@@ -301,6 +301,7 private
301 end
301 end
302
302
303 @issue.project = @project
303 @issue.project = @project
304 @issue.author = User.current
304 # Tracker must be set before custom field values
305 # Tracker must be set before custom field values
305 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
306 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
306 if @issue.tracker.nil?
307 if @issue.tracker.nil?
@@ -314,7 +315,6 private
314 @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
315 @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
315 end
316 end
316 end
317 end
317 @issue.author = User.current
318 @priorities = IssuePriority.all
318 @priorities = IssuePriority.all
319 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
319 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
320 end
320 end
@@ -22,6 +22,7 roles_001:
22 - :delete_issues
22 - :delete_issues
23 - :view_issue_watchers
23 - :view_issue_watchers
24 - :add_issue_watchers
24 - :add_issue_watchers
25 - :set_issues_private
25 - :delete_issue_watchers
26 - :delete_issue_watchers
26 - :manage_public_queries
27 - :manage_public_queries
27 - :save_queries
28 - :save_queries
@@ -612,6 +612,36 class IssuesControllerTest < ActionController::TestCase
612 assert_not_nil issue
612 assert_not_nil issue
613 assert_nil issue.parent
613 assert_nil issue.parent
614 end
614 end
615
616 def test_post_create_private
617 @request.session[:user_id] = 2
618
619 assert_difference 'Issue.count' do
620 post :create, :project_id => 1,
621 :issue => {:tracker_id => 1,
622 :subject => 'This is a private issue',
623 :is_private => '1'}
624 end
625 issue = Issue.first(:order => 'id DESC')
626 assert issue.is_private?
627 end
628
629 def test_post_create_private_with_set_own_issues_private_permission
630 role = Role.find(1)
631 role.remove_permission! :set_issues_private
632 role.add_permission! :set_own_issues_private
633
634 @request.session[:user_id] = 2
635
636 assert_difference 'Issue.count' do
637 post :create, :project_id => 1,
638 :issue => {:tracker_id => 1,
639 :subject => 'This is a private issue',
640 :is_private => '1'}
641 end
642 issue = Issue.first(:order => 'id DESC')
643 assert issue.is_private?
644 end
615
645
616 def test_post_create_should_send_a_notification
646 def test_post_create_should_send_a_notification
617 ActionMailer::Base.deliveries.clear
647 ActionMailer::Base.deliveries.clear
General Comments 0
You need to be logged in to leave comments. Login now