jro_apps/redmine Commit - r3934:f92dcdf50a4c

Allow setting an issue's notes via params[:issue][:notes]. (XML API)...

Eric Davis -

r3934:f92dcdf50a4c

parent child

Context file:

r3934:f92dcdf50a4c

Collapse all files

app/controllers/issues_controller.rb +1 -1

                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @time_entry = TimeEntry.new
-                 @notes = params[:notes]
+                 @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
                  @issue.init_journal(User.current, @notes)
                  # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                  if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]

test/integration/issues_api_test.rb +15 -5

                  setup do
                    @issue_count = Issue.count
                    @journal_count = Journal.count
-                   @attributes = {:subject => 'API update'}
+                   @attributes = {:subject => 'API update', :notes => 'A new note'}
                    put '/issues/1.xml', {:issue => @attributes}, :authorization => credentials('jsmith')
                  end
                    assert_equal Journal.count, @journal_count + 1
                  end
+                 should "add the note to the journal" do
+                   journal = Journal.last
+                   assert_equal "A new note", journal.notes
+                 end
                  should "update the issue" do
                    issue = Issue.find(1)
                    @attributes.each do |attribute, value|
-                     assert_equal value, issue.send(attribute)
+                     assert_equal value, issue.send(attribute) unless attribute == :notes
                    end
                  end
                  setup do
                    @issue_count = Issue.count
                    @journal_count = Journal.count
-                   @attributes = {:subject => 'API update'}
+                   @attributes = {:subject => 'API update', :notes => 'A new note'}
                    put '/issues/1.json', {:issue => @attributes}, :authorization => credentials('jsmith')
                  end
                    assert_equal Journal.count, @journal_count + 1
                  end
+                 should "add the note to the journal" do
+                   journal = Journal.last
+                   assert_equal "A new note", journal.notes
+                 end
                  should "update the issue" do
                    issue = Issue.find(1)
                    @attributes.each do |attribute, value|
-                     assert_equal value, issue.send(attribute)
+                     assert_equal value, issue.send(attribute) unless attribute == :notes
                    end
                  end
                end
                context "PUT /issues/1.json with failed update" do

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