Changeset 5966
- Timestamp:
- 01/17/07 00:43:53 (2 years ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_controller/rescue.rb (modified) (1 diff)
- trunk/actionpack/test/controller/rescue_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r5965 r5966 1 1 *SVN* 2 3 * RecordInvalid, RecordNotSaved => 422 Unprocessable Entity, StaleObjectError => 409 Conflict. #7097 [dkubb] 2 4 3 5 * Allow fields_for to be nested inside form_for, so that the name and id get properly constructed [Jamis Buck] trunk/actionpack/lib/action_controller/rescue.rb
r5941 r5966 17 17 'ActionController::UnknownAction' => :not_found, 18 18 'ActiveRecord::RecordNotFound' => :not_found, 19 'ActiveRecord::RecordInvalid' => :bad_request 19 'ActiveRecord::StaleObjectError' => :conflict, 20 'ActiveRecord::RecordInvalid' => :unprocessable_entity, 21 'ActiveRecord::RecordNotSaved' => :unprocessable_entity 20 22 } 21 23 trunk/actionpack/test/controller/rescue_test.rb
r5926 r5966 142 142 assert_equal :not_found, responses[ActionController::UnknownAction.name] 143 143 assert_equal :not_found, responses['ActiveRecord::RecordNotFound'] 144 assert_equal :bad_request, responses['ActiveRecord::RecordInvalid'] 144 assert_equal :conflict, responses['ActiveRecord::StaleObjectError'] 145 assert_equal :unprocessable_entity, responses['ActiveRecord::RecordInvalid'] 146 assert_equal :unprocessable_entity, responses['ActiveRecord::RecordNotSaved'] 145 147 end 146 148
