fixed conflict

2017-06-04 10:23:38 +06:30
parent e5e14aaa62 3161c87a95
commit fa34d1db8f
18 changed files with 163 additions and 121 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,12 +119,15 @@ Rails.application.routes.draw do

    resources :menu_categories do
      #menu_items
-      #resources :menu_items
+      # resources :menu_items
      resources :simple_menu_items
      resources :set_menu_items
    end

-    resources :menu_items do
+    resources :simple_menu_items do
+      resources :menu_item_instances
+    end
+    resources :set_menu_items do
      resources :menu_item_instances
    end
    #menu_item_attributes