Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

x_11_file_import_via_plugin #65

Open
flip wants to merge 65 commits from x_11_file_import_via_plugin into develop
pull from: x_11_file_import_via_plugin
merge into: Foodsoft:develop
Conversation 0 Commits 65 Files changed 463 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2151835afb - Show all commits

2
config/navigation.rb
View file

@ -12,7 +12,7 @@ SimpleNavigation::Configuration.run do |navigation|
primary.item :dashboard_nav_item, I18n.t('navigation.dashboard'), root_path(anchor: '') primary.item :dashboard_nav_item, I18n.t('navigation.dashboard'), root_path(anchor: '')
primary.item :foodcoop, I18n.t('navigation.foodcoop'), '#' do |subnav| primary.item :foodcoop, I18n.t('navigation.foodcoop'), '#' do |subnav|
subnav.item :members, I18n.t('navigation.members'), foodcoop_users_path, unless: Proc.new { FoodsoftConfig[:disable_members_overview] } subnav.item :members, I18n.t('navigation.members'), foodcoop_users_path, unless: proc { FoodsoftConfig[:disable_members_overview] }
subnav.item :workgroups, I18n.t('navigation.workgroups'), foodcoop_workgroups_path subnav.item :workgroups, I18n.t('navigation.workgroups'), foodcoop_workgroups_path
subnav.item :ordergroups, I18n.t('navigation.ordergroups'), foodcoop_ordergroups_path subnav.item :ordergroups, I18n.t('navigation.ordergroups'), foodcoop_ordergroups_path
subnav.item :tasks, I18n.t('navigation.tasks'), tasks_path subnav.item :tasks, I18n.t('navigation.tasks'), tasks_path