raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11591 from dacook/admin-users-api-key-9833

Browse Source 
Redirect to admin users edit path on success
This commit is contained in:
Konrad
2023-10-01 12:20:46 +02:00
committed by GitHub
parent 06ebeeac0f e844d71abc
commit 33d9ed4000
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/spree/admin/users_controller.rb
View File

@@ -33,8 +33,8 @@ module Spree
@user.spree_roles = roles.compact_blank.collect{ |r| Spree::Role.find(r) }
end
flash.now[:success] = Spree.t(:created_successfully)
render :edit
flash[:success] = Spree.t(:created_successfully)
redirect_to edit_admin_user_path(@user)
else
render :new
end
@@ -50,9 +50,11 @@ module Spree
@user.spree_roles = roles.compact_blank.collect{ |r| Spree::Role.find(r) }
end
flash.now[:success] = update_message
flash[:success] = update_message
redirect_to edit_admin_user_path(@user)
else
render :edit
end
render :edit
end
protected

7
spec/controllers/spree/admin/users_controller_spec.rb
View File

@@ -22,6 +22,13 @@ describe Spree::Admin::UsersController do
it "allows admins to update a user's show api key view" do
user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
spree_put :update, id: test_user.id, user: { show_api_key_view: true }
expect(response).to redirect_to spree.edit_admin_user_path(test_user)
end
it "re-renders the edit form if error" do
user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
spree_put :update, id: test_user.id, user: { password: "blah", password_confirmation: "" }
expect(response).to render_template :edit
end