4 files changed, 12 insertions, 6 deletions

diff --git a/app/controllers/menu_items_controller.rb b/app/controllers/menu_items_controller.rb
index b095c8df..8b4e636e 100644
--- a/app/controllers/menu_items_controller.rb
+++ b/app/controllers/menu_items_controller.rb
@@ -19,7 +19,9 @@ class MenuItemsController < ApplicationController
   end
 
   def create
-    if MenuItem.create( menu_item_params )
+    @menu_item = MenuItem.new( menu_item_params )
+
+    if @menu_item.save
       redirect_to menu_items_path
     else
       render :new
@@ -58,6 +60,6 @@ class MenuItemsController < ApplicationController
   private
 
     def menu_item_params
-      params.require(:menu_item).permit(:node_id, :path, :position, :type, :title, :type_id)
+      params.require(:menu_item).permit(:node_id, :path, :position, :titles => {})
     end
 end
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 7769b7fa..b8df9ddb 100644
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -3,11 +3,17 @@ class MenuItem < ApplicationRecord
   default_scope -> { where(:type => "MenuItem") }
   
   translates    :title
+  validates     :title, presence: true
   
   acts_as_list  :scope => :type
   
   before_save   :determine_type_id
   
+  def titles=(values)
+    values.each do |locale, value|
+      Globalize.with_locale(locale) { self.title = value.to_s.strip.presence }
+    end
+  end
   
   private
   
diff --git a/app/views/menu_items/edit.html.erb b/app/views/menu_items/edit.html.erb
index 0652dc78..2bd65575 100644
--- a/app/views/menu_items/edit.html.erb
+++ b/app/views/menu_items/edit.html.erb
@@ -15,8 +15,7 @@
     <div class="layout_row_label"><%= MenuItem.human_attribute_name(:path) %></div>
     <div class="layout_row_content"><%= f.text_field :path %></div>
 
-    <div class="layout_row_label"><%= MenuItem.human_attribute_name(:title) %></div>
-    <div class="layout_row_content"><%= f.text_field :title %></div>
+    <%= render "title_fields", :menu_item => @menu_item %>
 
     <div class="layout_row_label"></div>
     <div class="layout_row_content"><%= f.submit t("admin.common.update") %></div>
diff --git a/app/views/menu_items/new.html.erb b/app/views/menu_items/new.html.erb
index 713ac967..08872ec0 100644
--- a/app/views/menu_items/new.html.erb
+++ b/app/views/menu_items/new.html.erb
@@ -13,8 +13,7 @@
   <div class="layout_row_label"><%= MenuItem.human_attribute_name(:path) %></div>
   <div class="layout_row_content"><%= f.text_field :path %></div>
 
-  <div class="layout_row_label"><%= MenuItem.human_attribute_name(:title) %></div>
-  <div class="layout_row_content"><%= f.text_field :title %></div>
+  <%= render "title_fields", :menu_item => @menu_item %>
 
   <div class="layout_row_content"><%= f.submit t("admin.common.create") %></div>
 <% end %>