diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 31 |
2 files changed, 26 insertions, 7 deletions
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 48d8e54a3..96882e20d 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -54,7 +54,7 @@ urlpatterns = [ url(r'revert-contextrecord/(?P<pk>.+)/(?P<date>.+)$', views.revert_contextrecord, name='revert-contextrecord'), url(r'generate-relation-image-contextrecord/(?P<pk>.+)/(' - r'?P<type>(bellow)|(above))?', + r'?P<type>(bellow)|(above)|(full))?', views.GenerateRelationImage.as_view(), name='generate-relation-image-contextrecord'), url(r'get-contextrecord/own/(?P<type>.+)?$', views.get_contextrecord, diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 122da8c2f..e27aacb41 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -165,25 +165,44 @@ def reset_wizards(request): class GenerateRelationImage(IshtarMixin, LoginRequiredMixin, RedirectView): + upper_model = models.Operation model = models.ContextRecord def get_redirect_url(self, *args, **kwargs): + if self.upper_item: + return reverse( + 'display-item', + args=[self.upper_model.SLUG, self.upper_item.pk]) + "#cr" return reverse('display-item', args=[self.model.SLUG, self.item.pk]) + "#relations" def get(self, request, *args, **kwargs): - try: - self.item = self.model.objects.get(pk=kwargs['pk']) - except self.model.DoesNotExist: - raise Http404() - render_above, render_bellow = True, True + self.upper_item = None render_type = kwargs.get("type", None) + if render_type == "full" and self.upper_model: + try: + self.upper_item = self.upper_model.objects.get(pk=kwargs['pk']) + except self.model.DoesNotExist: + raise Http404() + q = self.upper_item.context_record_relations_q() + if not q.count(): + return super(GenerateRelationImage, self).get(request, *args, + **kwargs) + self.item = q.all()[0].left_record + else: + try: + self.item = self.model.objects.get(pk=kwargs['pk']) + except self.model.DoesNotExist: + raise Http404() + render_above, render_bellow, full = True, True, False if render_type == "above": render_bellow = False elif render_type == "bellow": render_above = False + elif render_type == "full": + full = True self.item.generate_relation_image( - render_bellow=render_bellow, render_above=render_above) + render_bellow=render_bellow, render_above=render_above, full=full) return super(GenerateRelationImage, self).get(request, *args, **kwargs) |