diff --git a/openslides/application/views.py b/openslides/application/views.py index e42740c17..94e32a1a2 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -410,6 +410,7 @@ def delete_poll(request, poll_id): del_confirm_form(request, poll, name=_("the %s. poll") % count, delete_link=reverse('application_poll_delete', args=[poll_id])) return redirect(reverse('application_view', args=[application.id])) + class ApplicationDelete(DeleteView): """ Delete one or more Applications. diff --git a/openslides/config/models.py b/openslides/config/models.py index f4425a54c..be59d61ad 100644 --- a/openslides/config/models.py +++ b/openslides/config/models.py @@ -46,14 +46,20 @@ class Config(object): self.config[key] = loads(base64.decodestring(str(value))) def __getitem__(self, key): - try: - self.config - except AttributeError: - self.load_config() + # Had to be deactivated, because in more than one thread the values have + # to be loaded on each request. + ## try: + ## self.config + ## except AttributeError: + ## self.load_config() + ## try: + ## return self.config[key] + ## except KeyError: + ## pass try: - return self.config[key] - except KeyError: + return loads(base64(ConfigStore.objects.get(key=key).value)) + except ConfigStore.DoesNotExist: pass for receiver, value in default_config_value.send(sender='config', key=key):