pulled master at 4

2017-06-04 18:29:58 +06:30
parent 8d4086d5e9 eb74eb2a2d
commit 9b90e3bd7e
71 changed files with 590 additions and 161 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -121,12 +121,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