diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py index d37241925..3c68bb330 100644 --- a/openslides/agenda/models.py +++ b/openslides/agenda/models.py @@ -112,11 +112,13 @@ class Item(MPTTModel, SlideMixin): * view * delete """ - if self.releated_sid: - return self.get_releated_slide().get_absolute_url(link) if link == 'view': + if self.releated_sid: + return self.get_releated_slide().get_absolute_url(link) return reverse('item_view', args=[str(self.id)]) if link == 'edit': + if self.releated_sid: + return self.get_releated_slide().get_absolute_url(link) return reverse('item_edit', args=[str(self.id)]) if link == 'delete': return reverse('item_delete', args=[str(self.id)]) diff --git a/openslides/application/views.py b/openslides/application/views.py index 7e6edd028..e42740c17 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -124,13 +124,13 @@ def overview(request): # is not callable from within djangos templates.. for (i, application) in enumerate(applications): try: - applications[i] = { + applications[i] = { 'actions' : application.get_allowed_actions(request.user), 'application' : application } except: # todo: except what? - applications[i] = { + applications[i] = { 'actions' : [], 'application' : application } @@ -463,7 +463,7 @@ class ApplicationDelete(DeleteView): def gen_confirm_form(self, request, message, url): formbase = '%s