From 95f5686b1c8b386eae6a662e4a23332046932c95 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 26 May 2016 01:23:02 +0200 Subject: [PATCH] suite --- app/helpers/menu_items_helper.rb | 4 ++-- config/routes.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/menu_items_helper.rb b/app/helpers/menu_items_helper.rb index d66ee8a..f8cefc7 100644 --- a/app/helpers/menu_items_helper.rb +++ b/app/helpers/menu_items_helper.rb @@ -13,7 +13,7 @@ module MenuItemsHelper end name = menu_item_lang.name if menu_item_lang.enabled == true and menu_item_lang.visible == true - link_to name, menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug), :class => ("active" if active) + link_to name, menu_item_path(:url => menu_item_lang.url), :class => ("active" if active) end end @@ -26,7 +26,7 @@ module MenuItemsHelper name = menu_item_lang.name+("" if sym and @menu_item and @menu_item == menu_item ).to_s if menu_item_lang.enabled == true and menu_item_lang.visible == true - menu_item_path(:url => menu_item_lang.url, :lang => @lang.slug) + menu_item_path(:url => menu_item_lang.url) end end diff --git a/config/routes.rb b/config/routes.rb index c8e623b..9e9b703 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -304,8 +304,8 @@ Rails.application.routes.draw do - get ':lang/*url.html' => 'public/menu_items#show', :as => :menu_item, :f => "html" - get ':lang/*url.:f' => 'public/menu_items#redirect', :f => "html" + get '*url.html' => 'public/menu_items#show', :as => :menu_item, :f => "html" + get '*url.:f' => 'public/menu_items#redirect', :f => "html" root 'public/menu_items#show'