Adding manifeste to Collective and is_exhibit to Corpus

Author: guzmud

panpub/models.py

@@ -47,8 +47,15 @@ def collectives(self):
 
 class Collective(models.Model):
     name = models.CharField(max_length=100)
-    circles = models.ManyToManyField('self', blank=True)
-    members = models.ManyToManyField(Crafter, blank=True)
+    circles = models.ManyToManyField('self',
+                                     blank=True)
+    members = models.ManyToManyField(Crafter,
+                                     blank=True)
+    manifeste = models.ForeignKey('Text',
+                                  models.SET_NULL,
+                                  blank=True,
+                                  null=True,
+                                  )
 
     def get_absolute_url(self):
         return reverse('collective_detail', args=[str(self.pk), ])
@@ -63,6 +70,7 @@ class Corpus(models.Model):
     description = models.TextField(blank=True)
     license = models.CharField(max_length=100)
     ready = models.BooleanField(default=False)
+    is_exhibit = models.BooleanField(default=False)
 
     def get_absolute_url(self):
         return reverse('corpus_detail', args=[str(self.pk), ])

panpub/templates/panpub/collective_detail.html

@@ -1,9 +1,11 @@
 {% extends "base.html" %}
 {% load static %}
+{% load markdown_deux_tags %}
 
 {% block content %}
 <h1>{{ collective.name }}</h1>
 
+<h2>Circles</h2>
 <ul>
 {% for circle in collective.circles.all %}
 <li><a href="{{ circle.get_absolute_url }}">{{ circle.name }}</a></li>
@@ -12,11 +14,22 @@ <h1>{{ collective.name }}</h1>
 {% endfor %}
 </ul>
 
+<h2>Members</h2>
 <ul>
 {% for member in collective.members.all %}
 <li><a href="{{ member.get_absolute_url }}">{{ member }}</a></li>
 {% empty %}
 <li>No known member of this collective</li>
 {% endfor %}
 </ul>
+
+{% if collective.manifeste %}
+<h2>Manifeste: {{ collective.manifeste.name }}</h2>
+
+<p class="description">{{ collective.manifeste.description }} ({{ collective.manifeste.datestamp.created }})</p>
+
+<p>{{ collective.manifeste.claims }}</p>
+
+{{ collective.manifeste.document.read|markdown }}
+{% endif %}
 {% endblock content %}

panpub/templates/panpub/corpus_detail.html

@@ -4,7 +4,7 @@
 {% block content %}
 <h1>{{ corpus.name }}</h1>
 
-<p>{{ corpus.description }}</p>
+<p class="description">{{ corpus.description }}</p>
 
 <ul>
 {% for content in corpus.contents %}

panpub/templates/panpub/text_detail.html

@@ -5,7 +5,7 @@
 {% block content %}
 <h1>{{ text.name }}</h1>
 
-<p>{{ text.description }} ({{ text.datestamp.created }})</p>
+<p class="description">{{ text.description }} ({{ text.datestamp.created }})</p>
 
 <p>{{ text.claims }}</p>
 

panpub/views.py

@@ -48,7 +48,7 @@ class CrafterList(ListView):
 
 class CollectiveCreate(CreateView):
     model = Collective
-    fields = ['name', 'circles', 'members']
+    fields = ['name', 'circles', 'members', 'manifeste']
 
 
 class CollectiveDelete(DeleteView):
@@ -72,7 +72,7 @@ class CollectiveList(ListView):
 
 class CorpusCreate(CreateView):
     model = Corpus
-    fields = ['name', 'datestamp', 'description']
+    fields = ['name', 'datestamp', 'description', 'is_exhibit']
 
 
 class CorpusDelete(DeleteView):