CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Revert GlobalSettingsObject singleton as it broke tests

Browse Source
This commit is contained in:
Raphael Michel
2016-11-07 11:12:42 +01:00
parent 3ba8647464
commit 51aa8fa1ac
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/base/settings.py
View File

@@ -515,14 +515,8 @@ class SettingsSandbox:
class GlobalSettingsObject(): class GlobalSettingsObject():
data_dict = None
def __init__(self): def __init__(self):
# This is a singleton-like object. Multiple objects can exist, but they share their state self.settings = SettingsProxy(self, type=GlobalSetting)
if GlobalSettingsObject.data_dict: self.setting_objects = GlobalSetting.objects
self.__dict__ = GlobalSettingsObject.data_dict self.slug = '_global'
else:
self.settings = SettingsProxy(self, type=GlobalSetting)
self.setting_objects = GlobalSetting.objects
self.slug = '_global'
GlobalSettingsObject.data_dict = self.__dict__