Skip to content

Commit

Permalink
fix code to succeed with tests for related host views
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasWaldmann committed Jan 2, 2015
1 parent 8e55167 commit 01f426d
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions nsupdate/main/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@ class RelatedHostView(UpdateView):

@method_decorator(login_required)
def dispatch(self, *args, **kwargs):
try:
self.__main_host = Host.objects.get(pk=kwargs.pop('mpk', None), created_by=self.request.user)
except Host.DoesNotExist:
raise Http404
return super(RelatedHostView, self).dispatch(*args, **kwargs)

def get_success_url(self):
Expand All @@ -369,7 +373,7 @@ def form_valid(self, form):

def get_object(self, *args, **kwargs):
obj = super(RelatedHostView, self).get_object(*args, **kwargs)
if obj.main_host.created_by != self.request.user:
if obj.main_host.created_by != self.request.user or obj.main_host != self.__main_host:
raise Http404
return obj

Expand All @@ -385,11 +389,15 @@ class DeleteRelatedHostView(DeleteView):

@method_decorator(login_required)
def dispatch(self, *args, **kwargs):
try:
self.__main_host = Host.objects.get(pk=kwargs.pop('mpk', None), created_by=self.request.user)
except Host.DoesNotExist:
raise Http404
return super(DeleteRelatedHostView, self).dispatch(*args, **kwargs)

def get_object(self, *args, **kwargs):
obj = super(DeleteRelatedHostView, self).get_object(*args, **kwargs)
if obj.main_host.created_by != self.request.user:
if obj.main_host.created_by != self.request.user or obj.main_host != self.__main_host:
raise Http404
return obj

Expand Down

0 comments on commit 01f426d

Please sign in to comment.