merged settings_backend

app/controllers/settings/menu_categories_controller.rb

@@ -63,7 +63,14 @@ class Settings::MenuCategoriesController < ApplicationController
   # DELETE /settings/menu_categories/1
   # DELETE /settings/menu_categories/1.json
   def destroy
+    # instances = MenuItemInstance.where("menu_item_id=?",@settings_menu_item.id)
+    # instances.each do |instance|
+    #   instance.destroy
+    # end 
+    # @settings_menu_item.destroy
+    
     # @settings_menu_category.destroy
+    abc = MenuCategory.destroyCategory(@settings_menu_category)
     respond_to do |format|
       format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' }
       format.json { head :no_content }

app/controllers/settings/menu_item_instances_controller.rb

@@ -11,18 +11,21 @@ class Settings::MenuItemInstancesController < ApplicationController
   # GET /settings/menu_item_instances/1
   # GET /settings/menu_item_instances/1.json
   def show
-    @category = MenuCategory.find(@item.menu_category_id)
+    id = MenuItemInstance.findParentCategory(@item)
+    @category = MenuCategory.find(id)
   end
 
   # GET /settings/menu_item_instances/new
   def new
-    @category = MenuCategory.find(@item.menu_category_id)
+    id = MenuItemInstance.findParentCategory(@item)
+    @category = MenuCategory.find(id)
     @settings_menu_item_instances = MenuItemInstance.new
   end
 
   # GET /settings/menu_item_instances/1/edit
   def edit
-    @category = MenuCategory.find(@item.menu_category_id)
+    id = MenuItemInstance.findParentCategory(@item)
+    @category = MenuCategory.find(id)
   end
 
   # POST /settings/menu_item_instances
@@ -30,6 +33,7 @@ class Settings::MenuItemInstancesController < ApplicationController
   def create
     @settings_menu_item_instances = MenuItemInstance.new(settings_menu_item_instance_params)
 
+    #check if the menu item type is simple or not( not only the diff of status .. here is different routes)
     if params[:simple_menu_item_id]
       @settings_menu_item_instances.menu_item_id = params[:simple_menu_item_id]
       catID  = MenuItem.find(params[:simple_menu_item_id])
@@ -38,7 +42,8 @@ class Settings::MenuItemInstancesController < ApplicationController
       catID  = MenuItem.find(params[:set_menu_item_id])
     end
 
-    category = MenuCategory.find(catID.menu_category_id)
+    id = MenuItemInstance.findParentCategory(catID)
+    category = MenuCategory.find(id)
     respond_to do |format|
       if @settings_menu_item_instances.save
         @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
@@ -55,14 +60,15 @@ class Settings::MenuItemInstancesController < ApplicationController
   # PATCH/PUT /settings/menu_item_instances/1
   # PATCH/PUT /settings/menu_item_instances/1.json
   def update
-    puts "params[:menu_item_instance][:item_attributes]"
-    puts params[:menu_item_instance][:item_attributes]
+    #check if the menu item type is simple or not( not only the diff of status .. here is different routes)
     if params[:simple_menu_item_id]
       catID  = MenuItem.find(params[:simple_menu_item_id])
     else
       catID  = MenuItem.find(params[:set_menu_item_id])
     end
-    category = MenuCategory.find(catID.menu_category_id)
+
+    id = MenuItemInstance.findParentCategory(catID)
+    category = MenuCategory.find(id)
     respond_to do |format|
 
       if @settings_menu_item_instances.update(settings_menu_item_instance_params)
@@ -86,7 +92,13 @@ class Settings::MenuItemInstancesController < ApplicationController
     else
       catID  = MenuItem.find(params[:set_menu_item_id])
     end
-    category = MenuCategory.find(catID.menu_category_id)
+    # check if the menu item is sub of another menu item
+    if catID.menu_category_id
+      category = MenuCategory.find(catID.menu_category_id)
+    else
+      item = MenuItem.find(catID.menu_item_id)
+      category = MenuCategory.find(item.menu_category_id)
+    end
     respond_to do |format|
       format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' }
       format.json { head :no_content }

app/controllers/settings/menus_controller.rb

@@ -55,7 +55,8 @@ class Settings::MenusController < ApplicationController
   # DELETE /settings/menus/1
   # DELETE /settings/menus/1.json
   def destroy
-    @settings_menu.destroy
+    # @settings_menu.destroy
+    abc = Menu.destroyMenu(@settings_menu)
     respond_to do |format|
       format.html { redirect_to settings_menus_path, notice: 'Menu was successfully destroyed.' }
       format.json { head :no_content }

app/controllers/settings/set_menu_items_controller.rb

@@ -62,7 +62,7 @@ class Settings::SetMenuItemsController < ApplicationController
   # DELETE /settings/menu_items/1
   # DELETE /settings/menu_items/1.json
   def destroy
-    # @settings_menu_item.destroy
+    abc = MenuItem.deleteRecursive(@settings_menu_item)
     respond_to do |format|
       format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' }
       format.json { head :no_content }

app/controllers/settings/simple_menu_items_controller.rb

@@ -59,7 +59,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
   # DELETE /settings/menu_items/1
   # DELETE /settings/menu_items/1.json
   def destroy
-    # @settings_menu_item.destroy
+    abc = MenuItem.deleteRecursive(@settings_menu_item)
     respond_to do |format|
       format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
       format.json { head :no_content }