Skip to content

Commit

Permalink
Merge pull request #1307 from xliiv/fix/region-setting
Browse files Browse the repository at this point in the history
Fixed settings position in settings file.
  • Loading branch information
xliiv committed Feb 10, 2015
2 parents 3fb2c03 + 819f2e5 commit 11d3bf0
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/ralph/settings.py
Expand Up @@ -402,6 +402,13 @@
"Unsupported settings path mode '%s'" % SETTINGS_PATH_MODE
)

# change regions' default name
DEFAULT_REGION_NAME = 'Default region'

# a list of object's fields (e.g. Asset, Device) for which notification of
# changed value should be send (see ralph.util.models.SyncFieldMixin)
SYNC_FIELD_MIXIN_NOTIFICATIONS_WHITELIST = ['service', 'device_environment']

for cfg_loc in [local_settings,
'{}/settings'.format(ralph_settings_path),
'/etc/ralph/settings']:
Expand All @@ -410,14 +417,6 @@
execfile(cfg_loc)
break

# url to page where user requests permission to module (eg. assets)
# REQUEST_PERM_URL = 'http://tickets.office/request/ralph_module/permission'
DEFAULT_REGION_NAME = 'Default region'

# a list of object's fields (e.g. Asset, Device) for which notification of
# changed value should be send (see ralph.util.models.SyncFieldMixin)
SYNC_FIELD_MIXIN_NOTIFICATIONS_WHITELIST = ['service', 'device_environment']

import pluggableapp
pluggableapp.initialize(locals())

Expand Down

0 comments on commit 11d3bf0

Please sign in to comment.