diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index b488ac6f..cc5e89e8 100644
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -10,6 +10,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
+ @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index 4057cf72..2a391d8f 100644
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -10,6 +10,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
+ @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index a76f851a..238fa038 100644
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -9,7 +9,6 @@
-
| Item code | +Name | +Alt name | +Type | +Parent Item | +Created by | +Created at | ++ | |||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= settings_menu_item.item_code %> | +<%= settings_menu_item.name %> | +<%= settings_menu_item.alt_name %> | +<%= settings_menu_item.type %> | +<%= settings_menu_item.parent.name rescue "-" %> | +<%= settings_menu_item.created_by %> | +<%=l settings_menu_item.created_at, :format => :short %> | + + <% if settings_menu_item.type == "SimpleMenuItem" %> +<%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> | +<%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> | +<%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | + <% else %> +<%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> | +<%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> | +<%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | + <% end %> +
| Item code | +Name | +Alt name | +Type | +Parent Item | +Created by | +Created at | ++ | |||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= settings_menu_item.item_code %> | +<%= settings_menu_item.name %> | +<%= settings_menu_item.alt_name %> | +<%= settings_menu_item.type %> | +<%= settings_menu_item.parent.name rescue "-" %> | +<%= settings_menu_item.created_by %> | +<%=l settings_menu_item.created_at, :format => :short %> | + + <% if settings_menu_item.type == "SimpleMenuItem" %> +<%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> | +<%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> | +<%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | + <% else %> +<%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> | +<%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> | +<%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | + <% end %> +