From fa6a4339d86c66965ae6069b9a2bfebe1ab932c3 Mon Sep 17 00:00:00 2001 From: James Graham Date: Mon, 26 Apr 2021 21:03:03 +0100 Subject: [PATCH] fix: fix org map pin color on detail view --- people/views/organisation.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/people/views/organisation.py b/people/views/organisation.py index b678b32..eb06938 100644 --- a/people/views/organisation.py +++ b/people/views/organisation.py @@ -7,6 +7,7 @@ from django.utils import timezone from django.views.generic import CreateView, DetailView, ListView, UpdateView from people import forms, models +from .map import get_map_data class OrganisationCreateView(LoginRequiredMixin, CreateView): @@ -124,11 +125,7 @@ class OrganisationDetailView(LoginRequiredMixin, DetailView): answer_set = self.object.current_answers context['answer_set'] = answer_set - context['map_markers'] = [{ - 'name': self.object.name, - 'lat': getattr(answer_set, 'latitude', None), - 'lng': getattr(answer_set, 'longitude', None), - }] + context['map_markers'] = [get_map_data(self.object)] context['question_answers'] = {} if answer_set is not None: @@ -163,11 +160,7 @@ class OrganisationUpdateView(LoginRequiredMixin, UpdateView): context = super().get_context_data(**kwargs) answerset = self.object.current_answers - context['map_markers'] = [{ - 'name': self.object.name, - 'lat': getattr(answerset, 'latitude', None), - 'lng': getattr(answerset, 'longitude', None), - }] + context['map_markers'] = [get_map_data(self.object)] return context