From 77655bfffbdf99c11c564010b222c5ab6b83f1bd Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 12 Mar 2019 19:10:49 +0000 Subject: [PATCH] Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu See the menu is_active code here: https://github.com/openfoodfoundation/spree/blob/f55722b38db7e706a8521c9091a0e00119bb4d20/backend/app/helpers/spree/admin/navigation_helper.rb#L145 --- app/controllers/admin/contents_controller.rb | 2 +- app/views/admin/contents/edit.html.haml | 4 ++-- app/views/spree/admin/shared/_configuration_menu.html.haml | 2 +- config/routes/admin.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/contents_controller.rb b/app/controllers/admin/contents_controller.rb index 26a6493f95..44569a42e1 100644 --- a/app/controllers/admin/contents_controller.rb +++ b/app/controllers/admin/contents_controller.rb @@ -18,7 +18,7 @@ module Admin flash[:success] = t(:successfully_updated, :resource => I18n.t('admin.contents.edit.your_content')) - redirect_to main_app.edit_admin_content_path + redirect_to main_app.edit_admin_contents_path end private diff --git a/app/views/admin/contents/edit.html.haml b/app/views/admin/contents/edit.html.haml index e0bdb0adc0..21ce8f52fd 100644 --- a/app/views/admin/contents/edit.html.haml +++ b/app/views/admin/contents/edit.html.haml @@ -3,7 +3,7 @@ - content_for :page_title do = t('.title') -= form_tag main_app.admin_content_path, method: :put, multipart: true do += form_tag main_app.admin_contents_path, method: :put, multipart: true do #preferences - @preference_sections.each do |preference_section| = render 'fieldset', name: preference_section[:name], preferences: preference_section[:preferences] @@ -11,4 +11,4 @@ .form-buttons.filter-actions.actions{"data-hook" => "buttons"} = button t(:update), 'icon-refresh' %span.or= t(:or) - = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_content_path, class: 'button' + = link_to_with_icon 'icon-remove', t(:cancel), main_app.edit_admin_contents_path, class: 'button' diff --git a/app/views/spree/admin/shared/_configuration_menu.html.haml b/app/views/spree/admin/shared/_configuration_menu.html.haml index b7fc2f5cdc..76bc3cdadd 100644 --- a/app/views/spree/admin/shared/_configuration_menu.html.haml +++ b/app/views/spree/admin/shared/_configuration_menu.html.haml @@ -22,7 +22,7 @@ = configurations_sidebar_menu_item t(:enterprise_fees), main_app.admin_enterprise_fees_path = configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path = configurations_sidebar_menu_item t('admin.cache_settings.edit.title'), main_app.edit_admin_cache_settings_path - = configurations_sidebar_menu_item t('admin.contents.edit.title'), main_app.edit_admin_content_path + = configurations_sidebar_menu_item t('admin.contents.edit.title'), main_app.edit_admin_contents_path = configurations_sidebar_menu_item t('admin.invoice_settings.edit.title'), main_app.edit_admin_invoice_settings_path = configurations_sidebar_menu_item t('admin.matomo_settings.edit.title'), main_app.edit_admin_matomo_settings_path = configurations_sidebar_menu_item t('admin.stripe_connect_settings.edit.title'), main_app.edit_admin_stripe_connect_settings_path diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 1bd72d4fdd..130cbe0d76 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -68,7 +68,7 @@ Openfoodnetwork::Application.routes.draw do get :map_by_tag, on: :collection end - resource :content + resource :contents resource :cache_settings