Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add ability to customize flash messages in admin panel easily
Damian Legawiec6d1a3e7937a4
diff --git a/admin/app/controllers/spree/admin/resource_controller.rb b/admin/app/controllers/spree/admin/resource_controller.rbindex f7fb75dd1f..729b63beea 100644--- a/admin/app/controllers/spree/admin/resource_controller.rb+++ b/admin/app/controllers/spree/admin/resource_controller.rb@@ -37,11 +37,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerrespond_with(@object) do |format|if update_turbo_stream_enabled?format.turbo_stream do- flash.now[:success] = flash_message_for(@object, :successfully_updated)+ flash.now[:success] = message_after_updateendendformat.html do- flash[:success] = flash_message_for(@object, :successfully_updated)+ flash[:success] = message_after_updateredirect_to location_after_save, status: :see_otherendend@@ -66,11 +66,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerrespond_with(@object) do |format|if create_turbo_stream_enabled?format.turbo_stream do- flash.now[:success] = flash_message_for(@object, :successfully_created)+ flash.now[:success] = message_after_createendendformat.html do- flash[:success] = flash_message_for(@object, :successfully_created)+ flash[:success] = message_after_createredirect_to location_after_save, status: :see_otherendend@@ -240,6 +240,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControlleredit_object_url(@object)end+ def message_after_create+ flash_message_for(@object, :successfully_created)+ end++ def message_after_update+ flash_message_for(@object, :successfully_updated)+ end+def set_current_storereturn if @object.nil?diff --git a/admin/spec/controllers/spree/admin/resource_controller_spec.rb b/admin/spec/controllers/spree/admin/resource_controller_spec.rbnew file mode 100644index 0000000000..e8c93d199e--- /dev/null+++ b/admin/spec/controllers/spree/admin/resource_controller_spec.rb@@ -0,0 +1,81 @@+require 'spec_helper'++module Spree+ module Admin+ class DummyModelsController < Spree::Admin::ResourceController+ def model_class+ Spree::DummyModel+ end+ end+ end+end++describe Spree::Admin::DummyModelsController, type: :controller do+ stub_authorization!++ after(:all) do+ Rails.application.reload_routes!+ end++ before do+ Spree::Core::Engine.routes.draw do+ namespace :admin do+ resources :dummy_models+ end+ end+ end++ describe '#create' do+ subject { post :create, params: params }++ let(:params) do+ { dummy_model: { name: 'a dummy_model' } }+ end++ it 'creates the resource' do+ expect { subject }.to change { Spree::DummyModel.count }.by(1)+ end++ context 'without any parameters' do+ let(:params) { {} }++ before do+ allow_any_instance_of(Spree::DummyModel).to receive(:name).and_return('some name')+ end++ it 'creates the resource' do+ expect { subject }.to change { Spree::DummyModel.count }.by(1)+ end+ end+ end++ describe '#update' do+ subject { put :update, params: params }++ let(:dummy_model) { Spree::DummyModel.create!(name: 'a dummy_model') }++ let(:params) do+ {+ id: dummy_model.to_param,+ dummy_model: { name: 'dummy_model renamed' }+ }+ end++ it 'updates the resource' do+ expect { subject }.to change { dummy_model.reload.name }.from('a dummy_model').to('dummy_model renamed')+ end+ end++ describe '#destroy' do+ subject do+ delete :destroy, params: params+ end++ let!(:dummy_model) { Spree::DummyModel.create!(name: 'a dummy_model') }+ let(:params) { { id: dummy_model.id } }++ it 'destroys the resource' do+ expect { subject }.to change { Spree::DummyModel.count }.from(1).to(0)+ end+ end+end