pull origin master

2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -98,12 +98,14 @@ class Settings::SimpleMenuItemsController < ApplicationController
    params[:simple_menu_item][:item_options].delete_at(0)

    # Bind for Item Sets
-    if params[:simple_menu_item][:item_sets].count > 1
+    if params[:simple_menu_item][:item_sets].count > 0
      params[:simple_menu_item][:item_sets].delete_at(0)

      sets = ItemSet.find(params[:simple_menu_item][:item_sets])

-      if sets.count > 0
+      if sets.count >= 0
+        # destroy all item sets for edit 
+        @settings_menu_item.item_sets.destroy
        @settings_menu_item.item_sets = sets
      end
    end