From 037eb1f0f2bdaabf2386b2a6021f1a820539d75f Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 20 Apr 2017 19:22:30 +0630 Subject: [PATCH] Menu Item Attribute --- .../menu_item_attributes_controller.rb | 16 ++--- .../menu_item_attributes/_form.html.erb | 2 +- .../menu_item_attributes/edit.html.erb | 15 +++-- .../menu_item_attributes/index.html.erb | 58 ++++++++++--------- .../menu_item_attributes/new.html.erb | 14 +++-- .../menu_item_attributes/show.html.erb | 49 +++++++++++----- 6 files changed, 93 insertions(+), 61 deletions(-) diff --git a/app/controllers/settings/menu_item_attributes_controller.rb b/app/controllers/settings/menu_item_attributes_controller.rb index d8603cb3..1433cf34 100644 --- a/app/controllers/settings/menu_item_attributes_controller.rb +++ b/app/controllers/settings/menu_item_attributes_controller.rb @@ -4,7 +4,7 @@ class Settings::MenuItemAttributesController < ApplicationController # GET /settings/menu_item_attributes # GET /settings/menu_item_attributes.json def index - @settings_menu_item_attributes = Settings::MenuItemAttribute.all + @settings_menu_item_attributes = MenuItemAttribute.all end # GET /settings/menu_item_attributes/1 @@ -14,7 +14,7 @@ class Settings::MenuItemAttributesController < ApplicationController # GET /settings/menu_item_attributes/new def new - @settings_menu_item_attribute = Settings::MenuItemAttribute.new + @settings_menu_item_attribute = MenuItemAttribute.new end # GET /settings/menu_item_attributes/1/edit @@ -24,11 +24,11 @@ class Settings::MenuItemAttributesController < ApplicationController # POST /settings/menu_item_attributes # POST /settings/menu_item_attributes.json def create - @settings_menu_item_attribute = Settings::MenuItemAttribute.new(settings_menu_item_attribute_params) + @settings_menu_item_attribute = MenuItemAttribute.new(settings_menu_item_attribute_params) respond_to do |format| if @settings_menu_item_attribute.save - format.html { redirect_to @settings_menu_item_attribute, notice: 'Menu item attribute was successfully created.' } + format.html { redirect_to settings_menu_item_attributes_path, notice: 'Menu item attribute was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item_attribute } else format.html { render :new } @@ -42,7 +42,7 @@ class Settings::MenuItemAttributesController < ApplicationController def update respond_to do |format| if @settings_menu_item_attribute.update(settings_menu_item_attribute_params) - format.html { redirect_to @settings_menu_item_attribute, notice: 'Menu item attribute was successfully updated.' } + format.html { redirect_to settings_menu_item_attribute_path(@settings_menu_item_attribute), notice: 'Menu item attribute was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item_attribute } else format.html { render :edit } @@ -56,7 +56,7 @@ class Settings::MenuItemAttributesController < ApplicationController def destroy @settings_menu_item_attribute.destroy respond_to do |format| - format.html { redirect_to settings_menu_item_attributes_url, notice: 'Menu item attribute was successfully destroyed.' } + format.html { redirect_to settings_menu_item_attributes_path, notice: 'Menu item attribute was successfully destroyed.' } format.json { head :no_content } end end @@ -64,11 +64,11 @@ class Settings::MenuItemAttributesController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_settings_menu_item_attribute - @settings_menu_item_attribute = Settings::MenuItemAttribute.find(params[:id]) + @settings_menu_item_attribute = MenuItemAttribute.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_attribute_params - params.require(:settings_menu_item_attribute).permit(:attribute_type, :name, :value) + params.require(:menu_item_attribute).permit(:attribute_type, :name, :value) end end diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb index badcd9d3..db532caf 100644 --- a/app/views/settings/menu_item_attributes/_form.html.erb +++ b/app/views/settings/menu_item_attributes/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for([:settings, @settings_menu_item]) do |f| %> +<%= simple_form_for([:settings, @settings_menu_item_attribute]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/menu_item_attributes/edit.html.erb b/app/views/settings/menu_item_attributes/edit.html.erb index 4ae48477..b4d6035f 100644 --- a/app/views/settings/menu_item_attributes/edit.html.erb +++ b/app/views/settings/menu_item_attributes/edit.html.erb @@ -1,6 +1,11 @@ -

Editing Settings Menu Item Attribute

-<%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> - -<%= link_to 'Show', @settings_menu_item_attribute %> | -<%= link_to 'Back', settings_menu_item_attributes_path %> +
+
+ +
+ <%= render 'form', employee: @employee %> +
diff --git a/app/views/settings/menu_item_attributes/index.html.erb b/app/views/settings/menu_item_attributes/index.html.erb index d4c1bd0a..6ea26787 100644 --- a/app/views/settings/menu_item_attributes/index.html.erb +++ b/app/views/settings/menu_item_attributes/index.html.erb @@ -1,31 +1,35 @@ -

<%= notice %>

-

Settings Menu Item Attributes

- - - - - - - - - - - - - <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %> - - - - - - - - - <% end %> - -
Attribute typeNameValue
<%= settings_menu_item_attribute.attribute_type %><%= settings_menu_item_attribute.name %><%= settings_menu_item_attribute.value %><%= link_to 'Show', settings_menu_item_attribute %><%= link_to 'Edit', edit_settings_menu_item_attribute_path(settings_menu_item_attribute) %><%= link_to 'Destroy', settings_menu_item_attribute, method: :delete, data: { confirm: 'Are you sure?' } %>
+
+
    +
  • Home
    • +
  • Menu Item Attributes
    • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_attribute_path,:class => 'btn btn-primary btn-sm' %> + +
+

+
+ + + + + + + + -<%= link_to 'New Settings Menu Item Attribute', new_settings_menu_item_attribute_path %> + + <% @settings_menu_item_attributes.each do |settings_menu_item_attribute| %> + + + + + + + <% end %> + +
Attribute typeNameValue
<%= link_to settings_menu_item_attribute.attribute_type, settings_menu_item_attribute_path(settings_menu_item_attribute) %><%= settings_menu_item_attribute.name %><%= settings_menu_item_attribute.value %><%= link_to 'Edit', edit_settings_menu_item_attribute_path(settings_menu_item_attribute) %> + | <%= link_to 'Destroy', settings_menu_item_attribute_path(settings_menu_item_attribute), method: :delete, data: { confirm: 'Are you sure?' } %>
+
diff --git a/app/views/settings/menu_item_attributes/new.html.erb b/app/views/settings/menu_item_attributes/new.html.erb index 4320f8ef..9ac257e5 100644 --- a/app/views/settings/menu_item_attributes/new.html.erb +++ b/app/views/settings/menu_item_attributes/new.html.erb @@ -1,5 +1,11 @@ -

New Settings Menu Item Attribute

-<%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> - -<%= link_to 'Back', settings_menu_item_attributes_path %> +
+
+ +
+ <%= render 'form', settings_menu_item_attribute: @settings_menu_item_attribute %> +
diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb index 96c12883..5517c716 100644 --- a/app/views/settings/menu_item_attributes/show.html.erb +++ b/app/views/settings/menu_item_attributes/show.html.erb @@ -1,19 +1,36 @@ -

<%= notice %>

-

- Attribute type: - <%= @settings_menu_item_attribute.attribute_type %> -

+
+
    +
  • Home
    • +
  • Settings
    • +
  • Menu Item Attribute
    • + + +
+
+
+
+

Menu Item Attribute

+ + + + + + + + + -

- Name: - <%= @settings_menu_item_attribute.name %> -

+ + + + + + + + +
NameValueCreated AtAction
<%= @settings_menu_item_attribute.name %><%= @settings_menu_item_attribute.value rescue "-" %><%=l @settings_menu_item_attribute.created_at, format: :short %><%= link_to 'Edit', edit_settings_menu_item_attribute_path(@settings_menu_item_attribute, @settings_menu_item_attribute) %>
+
+
-

- Value: - <%= @settings_menu_item_attribute.value %> -

- -<%= link_to 'Edit', edit_settings_menu_item_attribute_path(@settings_menu_item_attribute) %> | -<%= link_to 'Back', settings_menu_item_attributes_path %> +