Fix lingering flash messages (#4932)

Author: coalest

app/controllers/account_requests_controller.rb

@@ -25,7 +25,7 @@ def create
     @bank_selected = true
 
     if !verify_recaptcha(model: @account_request)
-      flash[:alert] = "Invalid captcha submission"
+      flash.now[:alert] = "Invalid captcha submission"
       render :new
     elsif @account_request.save
       AccountRequestMailer.confirmation(account_request_id: @account_request.id).deliver_later

app/controllers/adjustments_controller.rb

@@ -45,7 +45,7 @@ def create
       flash[:notice] = "Adjustment was successful."
       redirect_to adjustment_path(@adjustment)
     else
-      flash[:error] = @adjustment.errors.collect { |error| "#{error.attribute}: " + error.message }.join("<br />".html_safe)
+      flash.now[:error] = @adjustment.errors.collect { |error| "#{error.attribute}: " + error.message }.join("<br />".html_safe)
       load_form_collections
       render :new
     end

app/controllers/admin/barcode_items_controller.rb

@@ -10,7 +10,7 @@ def update
     if @barcode_item.update(barcode_item_params)
       redirect_to admin_barcode_items_path, notice: "Updated Barcode Item!"
     else
-      flash[:error] = "Failed to update this Barcode Item."
+      flash.now[:error] = "Failed to update this Barcode Item."
       render :edit
     end
   end
@@ -33,7 +33,7 @@ def create
       end
     else
       load_base_items
-      flash[:error] = "Failed to create Barcode Item."
+      flash.now[:error] = "Failed to create Barcode Item."
       render :new
     end
   end

app/controllers/admin/base_items_controller.rb

@@ -12,7 +12,7 @@ def update
     if @base_item.update(base_item_params)
       redirect_to admin_base_items_path, notice: "Updated base item!"
     else
-      flash[:error] = "Failed to update this base item."
+      flash.now[:error] = "Failed to update this base item."
       render :edit
     end
   end
@@ -30,7 +30,7 @@ def create
     if @base_item.save
       redirect_to admin_base_items_path, notice: "Base Item added!"
     else
-      flash[:error] = "Failed to create Base Item."
+      flash.now[:error] = "Failed to create Base Item."
       render :new
     end
   end

app/controllers/admin/organizations_controller.rb

@@ -10,7 +10,7 @@ def update
     if OrganizationUpdateService.update(@organization, organization_params)
       redirect_to admin_organizations_path, notice: "Updated organization!"
     else
-      flash[:error] = @organization.errors.full_messages.join("\n")
+      flash.now[:error] = @organization.errors.full_messages.join("\n")
       render :edit
     end
   end
@@ -57,11 +57,11 @@ def create
       SnapshotEvent.publish(@organization) # need one to start with
       redirect_to admin_organizations_path, notice: "Organization added!"
     else
-      flash[:error] = "Failed to create Organization."
+      flash.now[:error] = "Failed to create Organization."
       render :new
     end
   rescue => e
-    flash[:error] = e
+    flash.now[:error] = e
     render :new
   end
 

app/controllers/admin/partners_controller.rb

@@ -16,7 +16,7 @@ def update
     if @partner.update(partner_attributes)
       redirect_to admin_partners_path, notice: "#{@partner.name} updated!"
     else
-      flash[:error] = "Something didn't work quite right -- try again?"
+      flash.now[:error] = "Something didn't work quite right -- try again?"
       render action: :edit
     end
   end

app/controllers/admin/questions_controller.rb

@@ -12,7 +12,7 @@ def create
     if @question.save
       redirect_to admin_questions_path
     else
-      flash[:error] = "Failed to create question. #{@question.punctuate(@question.errors.to_a)}"
+      flash.now[:error] = "Failed to create question. #{@question.punctuate(@question.errors.to_a)}"
       render :new
     end
   end
@@ -26,7 +26,7 @@ def update
     if @question.update(question_params)
       redirect_to admin_questions_path
     else
-      flash[:error] = "Failed to update question. #{@question.punctuate(@question.errors.to_a)}"
+      flash.now[:error] = "Failed to update question. #{@question.punctuate(@question.errors.to_a)}"
       render :edit
     end
   end

app/controllers/admin/users_controller.rb

@@ -46,7 +46,7 @@ def create
     flash[:notice] = "Created a new user!"
     redirect_to admin_users_path
   rescue => e
-    flash[:error] = "Failed to create user: #{e}"
+    flash.now[:error] = "Failed to create user: #{e}"
     render :new
   end
 

app/controllers/audits_controller.rb

@@ -36,7 +36,7 @@ def update
     if @audit.update(audit_params)
       save_audit_status_and_redirect(params)
     else
-      flash[:error] = @audit.errors.full_messages.join("\n")
+      flash.now[:error] = @audit.errors.full_messages.join("\n")
       @storage_locations = [@audit.storage_location]
       set_items
       @audit.line_items.build if @audit.line_items.empty?
@@ -64,7 +64,7 @@ def create
       render :new
     end
   rescue Errors::InsufficientAllotment, InventoryError => e
-    flash[:error] = e.message
+    flash.now[:error] = e.message
     render :new
   end
 
@@ -81,7 +81,7 @@ def handle_audit_errors
       attr = (error.attribute.to_s == 'base') ? '' : error.attribute.capitalize
       "#{attr} ".tr("_", " ") + error.message
     end
-    flash[:error] = error_message.join(", ")
+    flash.now[:error] = error_message.join(", ")
   end
 
   def set_audit

app/controllers/barcode_items_controller.rb

@@ -27,7 +27,7 @@ def create
         format.html { redirect_to barcode_items_path, notice: msg }
       end
     else
-      flash[:error] = "Something didn't work quite right -- try again?"
+      flash.now[:error] = "Something didn't work quite right -- try again?"
       render action: :new
     end
   end
@@ -78,7 +78,7 @@ def update
     if @barcode_item.update(barcode_item_params)
       redirect_to barcode_items_path, notice: "Barcode updated!"
     else
-      flash[:error] = "Something didn't work quite right -- try again?"
+      flash.now[:error] = "Something didn't work quite right -- try again?"
       render action: :edit
     end
   end