From b10e54375b74b3c8342694f3cab358e4cbd81324 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 8 Sep 2016 12:38:58 -0300 Subject: [PATCH] Fixing errors [Issue #24] --- core/decorators.py | 20 +++++++++++++++++++- core/mixins.py | 20 +++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/core/decorators.py b/core/decorators.py index 15f4c20..9cdbb8d 100644 --- a/core/decorators.py +++ b/core/decorators.py @@ -14,7 +14,25 @@ def log_decorator(log_action = '', log_resource = ''): action = Action.objects.filter(name = log_action) resource = Resource.objects.filter(name = log_resource) - action_resource = Action_Resource.objects.filter(action = action, resource = resource)[0] + if not action: + action = Action(name = log_action) + action.save() + else: + action = action[0] + + if not resource: + resource = Resource(name = log_resource) + resource.save() + else: + resource = resource[0] + + action_resource = Action_Resource.objects.filter(action = action, resource = resource) + + if not action_resource: + action_resource = Action_Resource(action = action, resource = resource) + action_resource.save() + else: + action_resource = action_resource[0] log = Log() log.user = request.user diff --git a/core/mixins.py b/core/mixins.py index 00681fa..154d5f5 100644 --- a/core/mixins.py +++ b/core/mixins.py @@ -9,7 +9,25 @@ class LogMixin(object): action = Action.objects.filter(name = self.log_action) resource = Resource.objects.filter(name = self.log_resource) - action_resource = Action_Resource.objects.filter(action = action, resource = resource)[0] + if not action: + action = Action(name = self.log_action) + action.save() + else: + action = action[0] + + if not resource: + resource = Resource(name = self.log_resource) + resource.save() + else: + resource = resource[0] + + action_resource = Action_Resource.objects.filter(action = action, resource = resource) + + if not action_resource: + action_resource = Action_Resource(action = action, resource = resource) + action_resource.save() + else: + action_resource = action_resource[0] log = Log() log.user = request.user -- libgit2 0.21.2