Removed hardcoded links from main tabnav.
* Reorganized routes and foodsoft config * Avoid saving of wrong foodcoop tokens when following hard coded link
This commit is contained in:
parent
9cb367463c
commit
2c1952d625
8 changed files with 81 additions and 113 deletions
|
|
@ -1,33 +1,25 @@
|
|||
# Loads and returns config and databases for selected foodcoop.
|
||||
# TODO: When to use class or module. It seems this could also be a Foodsoft-class?
|
||||
module Foodsoft
|
||||
@@configs = YAML.load(File.read(RAILS_ROOT + "/config/app_config.yml"))
|
||||
@@databases = YAML.load(File.read(RAILS_ROOT + "/config/database.yml"))
|
||||
@@env = RAILS_ENV
|
||||
mattr_accessor :env, :config, :database
|
||||
CONFIGS = YAML.load(File.read(RAILS_ROOT + "/config/app_config.yml"))
|
||||
DATABASES = YAML.load(File.read(RAILS_ROOT + "/config/database.yml"))
|
||||
|
||||
def env=(env)
|
||||
@@env = env
|
||||
class << self
|
||||
def env=(env)
|
||||
raise "No config or database for this environment (#{env}) available!" if CONFIGS[env].nil? or DATABASES[env].nil?
|
||||
@@config = CONFIGS[env].symbolize_keys
|
||||
@@database = DATABASES[env].symbolize_keys
|
||||
@@env = env
|
||||
end
|
||||
end
|
||||
|
||||
def env
|
||||
@@env
|
||||
end
|
||||
|
||||
def config(rails_env = @@env)
|
||||
raise "No config for this environment (or subdomain) available!" if @@configs[rails_env].nil?
|
||||
@@configs[rails_env].symbolize_keys
|
||||
end
|
||||
|
||||
def database(rails_env = @@env)
|
||||
raise "No database for this environment (or subdomain) available!" if @@databases[rails_env].nil?
|
||||
@@databases[rails_env].symbolize_keys
|
||||
end
|
||||
|
||||
extend self
|
||||
end
|
||||
|
||||
# Initial load the default config and database from rails environment
|
||||
Foodsoft.env = RAILS_ENV
|
||||
|
||||
# Configuration of the exception_notification plugin
|
||||
# Mailadresses are set in config/foodsoft.yaml
|
||||
ExceptionNotifier.exception_recipients = Foodsoft.config[:notification]['error_recipients']
|
||||
ExceptionNotifier.sender_address = Foodsoft.config[:notification]['sender_address']
|
||||
ExceptionNotifier.email_prefix = Foodsoft.config[:notification]['email_prefix']
|
||||
ExceptionNotifier.email_prefix = Foodsoft.config[:notification]['email_prefix']
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue