Merge pull request #3791 from AlchemyCMS/backport/7.4-stable/pr-3790

[7.4-stable] Fix exception in admin when current language is deleted

Author: tvdeyen

app/controllers/alchemy/admin/languages_controller.rb

@@ -30,6 +30,9 @@ def create
 
       def destroy
         if @language.destroy
+          if session[:alchemy_language_id] == @language.id
+            session.delete(:alchemy_language_id)
+          end
           flash[:notice] = Alchemy.t("Language successfully removed")
         else
           flash[:warning] = @language.errors.full_messages.to_sentence

app/models/alchemy/language/code.rb

@@ -13,6 +13,7 @@ def code=(code)
 
   module ClassMethods
     def find_by_code(code)
+      return unless code.respond_to?(:split)
       codes = code.split("-")
       codes << "" if codes.length == 1
       on_current_site.find_by(

lib/alchemy/controller_actions.rb

@@ -80,7 +80,8 @@ def load_alchemy_language_from_params
 
     def load_alchemy_language_from_id_or_code(id_or_code)
       Language.find_by(id: id_or_code) ||
-        Language.find_by_code(id_or_code)
+        Language.find_by_code(id_or_code) ||
+        Language.default
     end
 
     # Stores language in +Current.language+

spec/controllers/alchemy/admin/languages_controller_spec.rb

@@ -118,6 +118,16 @@
         expect(response).to redirect_to admin_languages_path
         expect(flash[:notice]).to eq("Language successfully removed.")
       end
+
+      it "removes the language from session if present" do
+        session[:alchemy_language_id] = language.id
+
+        delete :destroy, params: {id: language.id}
+        expect(response).to redirect_to admin_languages_path
+        expect(flash[:notice]).to eq("Language successfully removed.")
+
+        expect(session[:alchemy_language_id]).to be_nil
+      end
     end
   end
 

spec/controllers/alchemy/admin/pages_controller_spec.rb

@@ -47,6 +47,19 @@
         end
       end
     end
+
+    context "with wrong or missing language in session" do
+      let!(:site_1) { create(:alchemy_site) }
+      let!(:site_1_default_language) { create :alchemy_language, site: site_1, default: true }
+
+      it "should fall back to existing language if session language does not exist" do
+        session[:alchemy_language_id] = 123456789
+
+        expect {
+          get :index
+        }.to_not raise_error
+      end
+    end
   end
 
   describe "#destroy" do