From edee20eed4601e8c8546d1207af4b023241b3724 Mon Sep 17 00:00:00 2001
From: Arnaud Fabre <arnaud.fabre@camobscura.fr>
Date: Fri, 27 Mar 2015 12:38:26 +0100
Subject: [PATCH] edits on groups
---
legislature/management/commands/legislature_updates_models.py | 4 ++--
legislature/templates/legislature/representative_view.html | 2 +-
legislature/views.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/legislature/management/commands/legislature_updates_models.py b/legislature/management/commands/legislature_updates_models.py
index 05130733..5ce72595 100644
--- a/legislature/management/commands/legislature_updates_models.py
+++ b/legislature/management/commands/legislature_updates_models.py
@@ -29,11 +29,12 @@ class Command(BaseCommand):
# Group creation
try:
- mgroup = MGroup(group_ptr=mandate.group)
+ mgroup = MGroup.objects.get(group_ptr=mandate.group)
except MGroup.DoesNotExist:
mgroup = MGroup(group_ptr=mandate.group)
mgroup.__dict__.update(mandate.group.__dict__)
mgroup.save()
+ #print(mgroup)
mmandate.mgroup = mgroup
mmandate.save()
@@ -47,4 +48,3 @@ class Command(BaseCommand):
print('Groups')
for i, mgroup in enumerate(MGroup.objects.all()):
mgroup.update_active()
-
diff --git a/legislature/templates/legislature/representative_view.html b/legislature/templates/legislature/representative_view.html
index 3a3c1815..1750369a 100644
--- a/legislature/templates/legislature/representative_view.html
+++ b/legislature/templates/legislature/representative_view.html
@@ -31,7 +31,7 @@
<p>
{{ mandate.begin_date }} to {{ mandate.end_date }} <br>
<a href="{{ mandate|by_mandate_url }}">
- <strong>{{ mandate.group.kind }}</strong> : <em>{{ mandate.group.name }} ({{ mandate.group.abbreviation }})</em>
+ <strong>{{ mandate.group.kind }}</strong> : <em>{{ mandate.group.name }} ({{ mandate.group.abbreviation }})</em>
</a>
<br>
Constituency : {{ mandate.constituency.name }} <br>
diff --git a/legislature/views.py b/legislature/views.py
index 31c9634e..e5a011e8 100644
--- a/legislature/views.py
+++ b/legislature/views.py
@@ -17,6 +17,7 @@ def representatives_index(request):
def representative_by_name(request, name):
representative = get_object_or_404(
MRepresentative, full_name=name)
+
return render(
request,
'legislature/representative_view.html',
@@ -26,7 +27,6 @@ def representative_by_name(request, name):
def representative_view(request, num):
representative = get_object_or_404(MRepresentative, pk=num)
-
return render(
request,
'legislature/representative_view.html',
--
GitLab