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 +8 -1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c01c16ecdb - Show all commits

6
app/controllers/sessions_controller.rb
View file

@ -21,7 +21,11 @@ class SessionsController < ApplicationController
def destroy def destroy
logout logout
redirect_to login_url, :notice => I18n.t('sessions.logged_out') if FoodsoftConfig[:logout_redirect_url].present?
redirect_to FoodsoftConfig[:logout_redirect_url]
else
redirect_to login_url, :notice => I18n.t('sessions.logged_out')
end
end end
# redirect to root, going to default foodcoop when none given # redirect to root, going to default foodcoop when none given

3
config/app_config.yml.SAMPLE
View file

@ -32,6 +32,9 @@ default: &defaults
# custom foodsoft software URL (used in footer) # custom foodsoft software URL (used in footer)
#foodsoft_url: https://github.com/foodcoops/foodsoft #foodsoft_url: https://github.com/foodcoops/foodsoft
# URL to redirect to after logging out
# logout_redirect_url: https://foodcoop.test
# Default language # Default language
#default_locale: en #default_locale: en
# By default, foodsoft takes the language from the webbrowser/operating system. # By default, foodsoft takes the language from the webbrowser/operating system.