From 4b732e8d8c6b03f0121255c7cbf6b1bc7e735645 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 12 Sep 2017 17:23:42 +0630
Subject: [PATCH] menu edit fix

---
 .../menu_item_instances_controller.rb         |  6 +++--
 .../settings/set_menu_items_controller.rb     |  6 +++--
 .../settings/simple_menu_items_controller.rb  |  6 +++--
 .../menu_item_instances/edit.html.erb         | 23 ++++++++++++++++++-
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index 6b5f8652..ac2acc7f 100644
--- 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
diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index a9e91a94..d37a59c9 100644
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -75,12 +75,14 @@ class Settings::SetMenuItemsController < ApplicationController
     params[:set_menu_item][:item_options].delete_at(0)
 
     # Bind for Item Sets
-    if params[:set_menu_item][:item_sets].count > 1
+    if params[:set_menu_item][:item_sets].count > 0
       params[:set_menu_item][:item_sets].delete_at(0)
 
       sets = ItemSet.find(params[:set_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
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index e3010e30..319934ca 100644
--- 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
diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb
index d5884474..d82b8486 100644
--- a/app/views/settings/menu_item_instances/edit.html.erb
+++ b/app/views/settings/menu_item_instances/edit.html.erb
@@ -12,5 +12,26 @@
 		 </ul>
 		</div>
     <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances, item_sets: @item_sets %>
-
 </div>
+
+
+<script type="text/javascript">
+$(function(){
+	// auto selected after loaded
+	<% 
+		@settings_menu_item_instances.item_sets.each do |set|
+	%>
+	$("#menu_item_instance_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
+	<% 
+		end
+	%>
+
+	// After loaded
+	$("#menu_item_instance_item_sets").on('click', 'option', function(e){
+		if($(this).attr("selected")){
+			$(this).removeAttr("selected");
+			$(this).css({'color':'#000','background':'#fff'});
+		}
+	});
+});
+</script>