Skip to content

Commit e1ba543

Browse files
compwroncompwron
authored
Merge pull request #6645 from Budmin/unprocessable_entity_to_unprocessable_content
replaced :unprocessable_entity with :unprocessable_content
2 parents d9281a1 + 773f24a commit e1ba543

File tree

55 files changed

+142
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+142
-142
lines changed

‎app/controllers/additional_expenses_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def create
88
if @additional_expense.save
99
render json: @additional_expense.as_json, status: :created
1010
else
11-
render json: @additional_expense.errors.as_json, status: :unprocessable_entity
11+
render json: @additional_expense.errors.as_json, status: :unprocessable_content
1212
end
1313
end
1414

‎app/controllers/all_casa_admins/casa_admins_controller.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def create
1212
service.create!
1313
redirect_to all_casa_admins_casa_org_path(@casa_org), notice: "New admin created successfully"
1414
rescue ActiveRecord::RecordInvalid
15-
render :new, status: :unprocessable_entity
15+
render :new, status: :unprocessable_content
1616
end
1717
end
1818

@@ -28,7 +28,7 @@ def update
2828
@casa_admin.filter_old_emails!(@casa_admin.email)
2929
redirect_to edit_all_casa_admins_casa_org_casa_admin_path(@casa_org), notice: notice
3030
else
31-
render :edit, status: :unprocessable_entity
31+
render :edit, status: :unprocessable_content
3232
end
3333
end
3434

@@ -39,7 +39,7 @@ def activate
3939

4040
redirect_to edit_all_casa_admins_casa_org_casa_admin_path, notice: "Admin was activated. They have been sent an email."
4141
else
42-
render :edit, status: :unprocessable_entity
42+
render :edit, status: :unprocessable_content
4343
end
4444
end
4545

@@ -50,7 +50,7 @@ def deactivate
5050

5151
redirect_to edit_all_casa_admins_casa_org_casa_admin_path, notice: "Admin was deactivated."
5252
else
53-
render :edit, status: :unprocessable_entity
53+
render :edit, status: :unprocessable_content
5454
end
5555
end
5656

‎app/controllers/all_casa_admins/casa_orgs_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ def create
2525
end
2626
else
2727
respond_to do |format|
28-
format.html { render :new, status: :unprocessable_entity }
29-
format.json { render json: @casa_org.errors.full_messages, status: :unprocessable_entity }
28+
format.html { render :new, status: :unprocessable_content }
29+
format.json { render json: @casa_org.errors.full_messages, status: :unprocessable_content }
3030
end
3131
end
3232
end

‎app/controllers/all_casa_admins/patch_notes_controller.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def create
1313
if @patch_note.save
1414
render json: {status: :created, id: @patch_note.id}, status: :created
1515
else
16-
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_entity
16+
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_content
1717
end
1818
end
1919

@@ -23,7 +23,7 @@ def update
2323
if @patch_note.update(patch_note_params)
2424
render json: {status: :ok}
2525
else
26-
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_entity
26+
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_content
2727
end
2828
end
2929

@@ -34,7 +34,7 @@ def destroy
3434
if @patch_note.destroy
3535
render json: {status: :ok}
3636
else
37-
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_entity
37+
render json: {errors: @patch_note.errors.full_messages.to_json}, status: :unprocessable_content
3838
end
3939
end
4040

‎app/controllers/all_casa_admins_controller.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ def create
3030
end
3131
rescue ActiveRecord::RecordInvalid
3232
respond_to do |format|
33-
format.html { render :new, status: :unprocessable_entity }
33+
format.html { render :new, status: :unprocessable_content }
3434

3535
format.json do
36-
render json: @all_casa_admin.errors.full_messages, status: :unprocessable_entity
36+
render json: @all_casa_admin.errors.full_messages, status: :unprocessable_content
3737
end
3838
end
3939
end
@@ -53,8 +53,8 @@ def update
5353
end
5454
else
5555
respond_to do |format|
56-
format.html { render :edit, status: :unprocessable_entity }
57-
format.json { render json: @user.errors.full_messages, status: :unprocessable_entity }
56+
format.html { render :edit, status: :unprocessable_content }
57+
format.json { render json: @user.errors.full_messages, status: :unprocessable_content }
5858
end
5959
end
6060
end
@@ -78,8 +78,8 @@ def update_password
7878
end
7979
else
8080
respond_to do |format|
81-
format.html { render :edit, status: :unprocessable_entity }
82-
format.json { render json: @user.errors.full_messages, status: :unprocessable_entity }
81+
format.html { render :edit, status: :unprocessable_content }
82+
format.json { render json: @user.errors.full_messages, status: :unprocessable_content }
8383
end
8484
end
8585
end

‎app/controllers/banners_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def create
3535

3636
redirect_to banners_path
3737
rescue
38-
render :new, status: :unprocessable_entity
38+
render :new, status: :unprocessable_content
3939
end
4040

4141
def update
@@ -48,7 +48,7 @@ def update
4848

4949
redirect_to banners_path
5050
rescue
51-
render :edit, status: :unprocessable_entity
51+
render :edit, status: :unprocessable_content
5252
end
5353

5454
def destroy

‎app/controllers/bulk_court_dates_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def create
1515
case_group_id = params[:court_date][:case_group_id]
1616
if case_group_id.empty?
1717
@court_date = build_court_date_with_error_message
18-
render :new, status: :unprocessable_entity
18+
render :new, status: :unprocessable_content
1919
return
2020
end
2121

@@ -26,7 +26,7 @@ def create
2626

2727
if court_date_with_error
2828
@court_date = court_date_with_error
29-
render :new, status: :unprocessable_entity
29+
render :new, status: :unprocessable_content
3030
else
3131
redirect_to new_bulk_court_date_path, notice: "#{court_dates.size} #{"court date".pluralize(court_dates.size)} created!"
3232
end

‎app/controllers/casa_admins_controller.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ def update
2626
end
2727
else
2828
respond_to do |format|
29-
format.html { render :edit, status: :unprocessable_entity }
30-
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_entity }
29+
format.html { render :edit, status: :unprocessable_content }
30+
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_content }
3131
end
3232
end
3333
end
@@ -59,8 +59,8 @@ def create
5959
end
6060
rescue ActiveRecord::RecordInvalid
6161
respond_to do |format|
62-
format.html { render :new, status: :unprocessable_entity }
63-
format.json { render json: service.casa_admin.errors.full_messages, status: :unprocessable_entity }
62+
format.html { render :new, status: :unprocessable_content }
63+
format.json { render json: service.casa_admin.errors.full_messages, status: :unprocessable_content }
6464
end
6565
end
6666
end
@@ -81,8 +81,8 @@ def activate
8181
end
8282
else
8383
respond_to do |format|
84-
format.html { render :edit, status: :unprocessable_entity }
85-
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_entity }
84+
format.html { render :edit, status: :unprocessable_content }
85+
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_content }
8686
end
8787
end
8888
rescue Errno::ECONNREFUSED => error
@@ -100,8 +100,8 @@ def deactivate
100100
end
101101
else
102102
respond_to do |format|
103-
format.html { render :edit, status: :unprocessable_entity }
104-
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_entity }
103+
format.html { render :edit, status: :unprocessable_content }
104+
format.json { render json: @casa_admin.errors.full_messages, status: :unprocessable_content }
105105
end
106106
end
107107
rescue Errno::ECONNREFUSED => error

‎app/controllers/casa_cases_controller.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def create
5959
set_contact_types
6060
@empty_court_date = court_date_unknown?
6161
respond_to do |format|
62-
format.html { render :new, status: :unprocessable_entity }
63-
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_entity }
62+
format.html { render :new, status: :unprocessable_content }
63+
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_content }
6464
end
6565
end
6666
end
@@ -79,8 +79,8 @@ def update
7979
end
8080
else
8181
respond_to do |format|
82-
format.html { render :edit, status: :unprocessable_entity }
83-
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_entity }
82+
format.html { render :edit, status: :unprocessable_content }
83+
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_content }
8484
end
8585
end
8686
end
@@ -101,8 +101,8 @@ def deactivate
101101
end
102102
else
103103
respond_to do |format|
104-
format.html { render :edit, status: :unprocessable_entity }
105-
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_entity }
104+
format.html { render :edit, status: :unprocessable_content }
105+
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_content }
106106
end
107107
end
108108
end
@@ -123,8 +123,8 @@ def reactivate
123123
end
124124
else
125125
respond_to do |format|
126-
format.html { render :edit, status: :unprocessable_entity }
127-
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_entity }
126+
format.html { render :edit, status: :unprocessable_content }
127+
format.json { render json: @casa_case.errors.full_messages, status: :unprocessable_content }
128128
end
129129
end
130130
end

‎app/controllers/casa_org_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def update
3030
end
3131
else
3232
respond_to do |format|
33-
format.html { render :edit, status: :unprocessable_entity }
34-
format.json { render json: @casa_org.errors.full_messages, status: :unprocessable_entity }
33+
format.html { render :edit, status: :unprocessable_content }
34+
format.json { render json: @casa_org.errors.full_messages, status: :unprocessable_content }
3535
end
3636
end
3737
end

0 commit comments

Comments
 (0)