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/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -92,12 +92,14 @@ class Settings::MenuItemInstancesController < ApplicationController
    category = MenuCategory.find(id)

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

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

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