jro_apps/redmine Commit - r9792:18f693f9f7c1

0

app/controllers/application_controller.rb +6 0

                 render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
               end
+              # Renders a 200 response for successfull updates or deletions via the API
+              def render_api_ok
+                # head :ok would return a response body with one space
+                render :text => '', :status => :ok, :layout => nil
+              end
               # Renders API response on validation failure
               def render_validation_errors(objects)
                 if objects.is_a?(Array)

0

app/controllers/groups_controller.rb +4 -4

                   if @group.save
                     flash[:notice] = l(:notice_successful_update)
                     format.html { redirect_to(groups_path) }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   else
                     format.html { render :action => "edit" }
                     format.api  { render_validation_errors(@group) }
                 respond_to do |format|
                   format.html { redirect_to(groups_url) }
-                  format.api  { head :ok }
+                  format.api  { render_api_ok }
                 end
               end
                       users.each {|user| page.visual_effect(:highlight, "user-#{user.id}") }
                     }
                   }
-                  format.api { head :ok }
+                  format.api { render_api_ok }
                 end
               end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
                   format.js { render(:update) {|page| page.replace_html "tab-content-users", :partial => 'groups/users'} }
-                  format.api { head :ok }
+                  format.api { render_api_ok }
                 end
               end

0

app/controllers/issue_categories_controller.rb +2 -2

                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
                     }
-                    format.api { head :ok }
+                    format.api { render_api_ok }
                   end
                 else
                   respond_to do |format|
                   @category.destroy(reassign_to)
                   respond_to do |format|
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' }
-                    format.api { head :ok }
+                    format.api { render_api_ok }
                   end
                   return
                 end

0

app/controllers/issue_relations_controller.rb +1 -1

                 respond_to do |format|
                   format.html { redirect_to issue_path } # TODO : does this really work since @issue is always nil? What is it useful to?
                   format.js   { render(:update) {|page| page.remove "relation-#{@relation.id}"} }
-                  format.api  { head :ok }
+                  format.api  { render_api_ok }
                 end
               end

0

app/controllers/issues_controller.rb +2 -2

                   respond_to do |format|
                     format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|
                 end
                 respond_to do |format|
                   format.html { redirect_back_or_default(:action => 'index', :project_id => @project) }
-                  format.api  { head :ok }
+                  format.api  { render_api_ok }
                 end
               end

0

app/controllers/members_controller.rb +2 -2

                   }
                   format.api {
                     if saved
-                      head :ok
+                      render_api_ok
                     else
                       render_validation_errors(@member)
                     end
                   }
                   format.api {
                     if @member.destroyed?
-                      head :ok
+                      render_api_ok
                     else
                       head :unprocessable_entity
                     end

0

app/controllers/projects_controller.rb +2 -2

                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'settings', :id => @project
                     }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|
                   @project_to_destroy.destroy
                   respond_to do |format|
                     format.html { redirect_to :controller => 'admin', :action => 'projects' }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 end
                 # hide project in layout

0

app/controllers/timelog_controller.rb +2 -2

                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                     }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|
                   }
                   format.api  {
                     if destroyed
-                      head :ok
+                      render_api_ok
                     else
                       render_validation_errors(@time_entries)
                     end

0

app/controllers/users_controller.rb +2 -2

                       flash[:notice] = l(:notice_successful_update)
                       redirect_to_referer_or edit_user_path(@user)
                     }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 else
                   @auth_sources = AuthSource.find(:all)
                 @user.destroy
                 respond_to do |format|
                   format.html { redirect_to_referer_or(users_url) }
-                  format.api  { head :ok }
+                  format.api  { render_api_ok }
                 end
               end

0

app/controllers/versions_controller.rb +2 -2

                         flash[:notice] = l(:notice_successful_update)
                         redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                       }
-                      format.api  { head :ok }
+                      format.api  { render_api_ok }
                     end
                   else
                     respond_to do |format|
                   @version.destroy
                   respond_to do |format|
                     format.html { redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project }
-                    format.api  { head :ok }
+                    format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|

0

test/integration/api_test/groups_test.rb +4 0

                     should "update the group" do
                       put '/groups/10.xml', {:group => {:name => 'New name', :user_ids => [2, 3]}}, credentials('admin')
                       assert_response :ok
+                      assert_equal '', @response.body
                       group = Group.find(10)
                       assert_equal 'New name', group.name
                     assert_difference 'Group.count', -1 do
                       delete '/groups/10.xml', {}, credentials('admin')
                       assert_response :ok
+                      assert_equal '', @response.body
                     end
                   end
                 end
                     assert_difference 'Group.find(10).users.count' do
                       post '/groups/10/users.xml', {:user_id => 5}, credentials('admin')
                       assert_response :ok
+                      assert_equal '', @response.body
                     end
                     assert_include User.find(5), Group.find(10).users
                   end
                     assert_difference 'Group.find(10).users.count', -1 do
                       delete '/groups/10/users/8.xml', {}, credentials('admin')
                       assert_response :ok
+                      assert_equal '', @response.body
                     end
                     assert_not_include User.find(8), Group.find(10).users
                   end

0

test/integration/api_test/issue_categories_test.rb +3 0

                       put '/issue_categories/2.xml', {:issue_category => {:name => 'API Update'}}, credentials('jsmith')
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_equal 'API Update', IssueCategory.find(2).name
                   end
                 end
                     delete '/issue_categories/1.xml', {}, credentials('jsmith')
                   end
                   assert_response :ok
+                  assert_equal '', @response.body
                   assert_nil IssueCategory.find_by_id(1)
                 end
                     end
                   end
                   assert_response :ok
+                  assert_equal '', @response.body
                   assert_nil IssueCategory.find_by_id(1)
                 end
               end

0

test/integration/api_test/issue_relations_test.rb +1 0

                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_nil IssueRelation.find_by_id(2)
                   end
                 end

0

test/integration/api_test/issues_test.rb +1 0

                     {:issue => {:notes => 'Attachment added', :uploads => [{:token => token, :filename => 'test.txt', :content_type => 'text/plain'}]}},
                     credentials('jsmith')
                   assert_response :ok
+                  assert_equal '', @response.body
                 end
                 issue = Issue.find(1)

0

test/integration/api_test/memberships_test.rb +2 0

                         put '/memberships/2.xml', {:membership => {:user_id => 3, :role_ids => [1,2]}}, credentials('jsmith')
                         assert_response :ok
+                        assert_equal '', @response.body
                       end
                       member = Member.find(2)
                       assert_equal [1,2], member.role_ids.sort
                         delete '/memberships/2.xml', {}, credentials('jsmith')
                         assert_response :ok
+                        assert_equal '', @response.body
                       end
                       assert_nil Member.find_by_id(2)
                     end

0

test/integration/api_test/projects_test.rb +4 0

                         put '/projects/2.xml', @parameters, credentials('jsmith')
                       end
                       assert_response :ok
+                      assert_equal '', @response.body
                       assert_equal 'application/xml', @response.content_type
                       project = Project.find(2)
                       assert_equal 'API update', project.name
                         put '/projects/2.xml', @parameters, credentials('admin')
                       end
                       assert_response :ok
+                      assert_equal '', @response.body
                       project = Project.find(2)
                       assert_equal ['issue_tracking', 'news', 'time_tracking'], project.enabled_module_names.sort
                     end
                         put '/projects/2.xml', @parameters, credentials('admin')
                       end
                       assert_response :ok
+                      assert_equal '', @response.body
                       project = Project.find(2)
                       assert_equal [1, 3], project.trackers.map(&:id).sort
                     end
                       delete '/projects/2.xml', {}, credentials('admin')
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_nil Project.find_by_id(2)
                   end
                 end

0

test/integration/api_test/time_entries_test.rb +2 0

                       put '/time_entries/2.xml', {:time_entry => {:comments => 'API Update'}}, credentials('jsmith')
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_equal 'API Update', TimeEntry.find(2).comments
                   end
                 end
                     delete '/time_entries/2.xml', {}, credentials('jsmith')
                   end
                   assert_response :ok
+                  assert_equal '', @response.body
                   assert_nil TimeEntry.find_by_id(2)
                 end
               end

0

test/integration/api_test/users_test.rb +4 0

                       assert !user.admin?
                       assert_response :ok
+                      assert_equal '', @response.body
                     end
                   end
                       assert !user.admin?
                       assert_response :ok
+                      assert_equal '', @response.body
                     end
                   end
                 end
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                   end
                 end
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                   end
                 end
               end

0

test/integration/api_test/versions_test.rb +2 0

                     put '/versions/2.xml', {:version => {:name => 'API update'}}, credentials('jsmith')
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_equal 'API update', Version.find(2).name
                   end
                 end
                     end
                     assert_response :ok
+                    assert_equal '', @response.body
                     assert_nil Version.find_by_id(3)
                   end
                 end

	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