menus_controller.rb in spud_cms-0.8.17

- old
+ new

@@ -1,17 +1,17 @@
 class Spud::Admin::MenusController < Spud::Admin::CmsController
 	layout 'spud/admin/detail'
 	belongs_to_spud_app :menus
 	add_breadcrumb "Menus", :spud_admin_menus_path
 	before_filter :load_menu,:only => [:edit,:update,:show,:destroy]
-	
+
 	def index
 		@menus = SpudMenu.site(session[:admin_site]).order(:name).paginate :page => params[:page]
 		respond_with @menus
 	end
-	
 
+
 	def new
 		add_breadcrumb "New", :new_spud_admin_menu_path
 		@menu = SpudMenu.new
 		respond_with @menu
 	end
@@ -29,11 +29,11 @@
 		respond_with @menu
 	end
 
 	def update
 		add_breadcrumb "Edit #{@menu.name}", :edit_spud_admin_menu_path
-		
+
 		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(params[:spud_menu])
 		respond_with @menu,:location => spud_admin_menu_menu_items_url(:menu_id => @menu.id)
 	end
 
 	def destroy
@@ -44,9 +44,12 @@
 private
 	def load_menu
 		@menu = SpudMenu.site(session[:admin_site]).where(:id => params[:id]).first
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
+			redirect_to spud_admin_menus_url() and return false
+		elsif Spud::Core.multisite_mode_enabled && @menu.site_id != session[:admin_site]
+			flash[:warning] = "Site Context Changed. The menu you were viewing is not associated with the current site. Redirected back to menu selections."
 			redirect_to spud_admin_menus_url() and return false
 		end
 	end
 end