diff --git a/app/controllers/rules_controller.rb b/app/controllers/rules_controller.rb index a63f30ee1..e22b3578f 100644 --- a/app/controllers/rules_controller.rb +++ b/app/controllers/rules_controller.rb @@ -25,7 +25,7 @@ class RulesController < ApplicationController @rule = Current.family.rules.build(rule_params) if @rule.save - redirect_to confirm_rule_path(@rule) + redirect_to confirm_rule_path(@rule, reload_on_close: true) else render :new, status: :unprocessable_entity end diff --git a/app/views/accounts/new/_container.html.erb b/app/views/accounts/new/_container.html.erb index 47a75ca9d..67697da50 100644 --- a/app/views/accounts/new/_container.html.erb +++ b/app/views/accounts/new/_container.html.erb @@ -16,7 +16,7 @@ <%= title %> - <%= icon("x", as_button: true, size: "lg", data: { action: "dialog#close" }) %> + <%= icon("x", as_button: true, size: "lg", data: { action: "DS--dialog#close" }) %>
@@ -45,7 +45,7 @@
- + ESC
diff --git a/app/views/rules/confirm.html.erb b/app/views/rules/confirm.html.erb index 5307eaaff..35f27d374 100644 --- a/app/views/rules/confirm.html.erb +++ b/app/views/rules/confirm.html.erb @@ -1,4 +1,4 @@ -<%= render DS::Dialog.new(reload_on_close: true) do |dialog| %> +<%= render DS::Dialog.new(reload_on_close: params[:reload_on_close].present?) do |dialog| %> <% title = if @rule.name.present? "Confirm changes to \"#{@rule.name}\"" diff --git a/app/views/transactions/bulk_updates/new.html.erb b/app/views/transactions/bulk_updates/new.html.erb index 08c112abd..84394a8cc 100644 --- a/app/views/transactions/bulk_updates/new.html.erb +++ b/app/views/transactions/bulk_updates/new.html.erb @@ -21,7 +21,7 @@
- <%= render DS::Button.new(text: "Cancel", variant: "ghost", data: { action: "click->dialog#close" }) %> + <%= render DS::Button.new(text: "Cancel", variant: "ghost", data: { action: "click->DS--dialog#close" }) %> <%= render DS::Button.new(text: "Save", data: { bulk_select_scope_param: "bulk_update", action: "bulk-select#submitBulkRequest" }) %>
<% end %> diff --git a/test/controllers/rules_controller_test.rb b/test/controllers/rules_controller_test.rb index cb5f8a0d5..30432520b 100644 --- a/test/controllers/rules_controller_test.rb +++ b/test/controllers/rules_controller_test.rb @@ -71,7 +71,7 @@ class RulesControllerTest < ActionDispatch::IntegrationTest assert_equal "set_transaction_category", rule.actions.first.action_type assert_equal categories(:food_and_drink).id, rule.actions.first.value - assert_redirected_to confirm_rule_url(rule) + assert_redirected_to confirm_rule_url(rule, reload_on_close: true) end test "can update rule" do