Merge pull request #287 from ox-it/affiliation-optional

Affiliation optional

talks/contributors/views.py

@@ -362,11 +362,18 @@ def contributors_persons(request):
     count = request.GET.get('count', 20)
     page = request.GET.get('page', 1)
     letter = request.GET.get('letter', None)
+    persons_missing = request.GET.get('missing', None)
+
     if letter == 'None':
         letter = None
 
     args = {'count': count, 'letter': letter}
 
+    if persons_missing :
+            if persons_missing == 'affiliation':
+                args['missing'] = 'affiliation'
+                persons = persons.filter(bio='')
+
     if letter:
         # filter by letter
         persons = persons.filter(lastname__istartswith=letter)

talks/events/migrations/0008_auto_20150318_1624.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0007_auto_20150225_0950'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='bio',
+            field=models.TextField(null=True, verbose_name=b'Affiliation', blank=True),
+            preserve_default=True,
+        ),
+    ]

talks/events/models.py

@@ -149,7 +149,7 @@ class Person(models.Model):
     name = models.CharField(max_length=250)
     lastname = models.CharField(max_length=250, blank=True)
     slug = models.SlugField()
-    bio = models.TextField(verbose_name="Affiliation")
+    bio = models.TextField(verbose_name="Affiliation", null=True, blank=True)
     email_address = models.EmailField(max_length=254,
                                       null=True,
                                       blank=True)

talks/old_talks/models.py

@@ -76,7 +76,7 @@ def event_to_old_talk(event, series_id):
         data.append(("talk[list_id_strings][]", series_id))
         data.append(("talk[series_id_string]", series_id))
     if len(event.speakers.all()) > 0:
-        data.append(("talk[name_of_speaker]", ", ".join([speaker.name + ' (' + speaker.bio + ')' for speaker in event.speakers.all()])))
+        data.append(("talk[name_of_speaker]", ", ".join([get_person_string(speaker) for speaker in event.speakers.all()])))
     # sets the ex_directory status all the time to be sure to be in sync
     if event.special_message:
         data.append(("talk[special_message]", event.special_message))
@@ -96,9 +96,9 @@ def build_abstract(event):
         topics = event.api_topics
         abstract += "\nTopics: " + ", ".join([topic['prefLabel'] for topic in topics])
     if event.hosts.count() > 0:
-        abstract += "\n\nHosts: " + ", ".join([host.name + ' (' + host.bio + ')' for host in event.hosts.all()])
+        abstract += "\n\nHosts: " + ", ".join([get_person_string(host) for host in event.hosts.all()])
     if event.organisers.count() > 0:
-        abstract += "\n\nOrganisers: " + ", ".join([organiser.name + ' (' + organiser.bio + ')' for organiser in event.organisers.all()])
+        abstract += "\n\nOrganisers: " + ", ".join([get_person_string(organiser) for organiser in event.organisers.all()])
     if event.organiser_email:
         abstract += "\n\nContact email: " + event.organiser_email
     abstract += "\n\nAudience: " + dict(AUDIENCE_CHOICES)[event.audience]
@@ -112,6 +112,11 @@ def build_abstract(event):
 
     return abstract
 
+def get_person_string(person):
+    out = person.name
+    if person.bio:
+        out = out + ' (' + person.bio + ')'
+    return out
 
 def group_to_old_series(group):
     """Provide list data in old talks format
@@ -123,7 +128,7 @@ def group_to_old_series(group):
 
     description = group.description
     if group.organisers.count() > 0:
-        description += "\n\n\nOrganisers: " + ", ".join([organiser.name + ' (' + organiser.bio + ')' for organiser in group.organisers.all()])
+        description += "\n\n\nOrganisers: " + ", ".join([get_person_string(organiser) for organiser in group.organisers.all()])
 
     data.append(('list[details]', description))
     return data

talks/templates/contributors/contributors_persons.html

@@ -17,6 +17,12 @@ <h2>People administration</h2>
                 <li><a href="{% url 'contributors-eventgroups' %}" class="">Series  <span class="glyphicon glyphicon-ok filter-active"></span></a></li>
                 <li><a href="{% url 'contributors-persons' %}" class="filter-selected">People  <span class="glyphicon glyphicon-ok filter-active"></span></a></li>
             </ul>
+            <strong>Filters</strong>
+            <ul class="nav nav-list well">
+                <li class="nav-header"><i class="icon-star"></i>Missing Information</li>
+                <li><a href="{% facet_single_param missing='affiliation' %}" class="{% facet_selected missing='affiliation' %}">Affiliation <span class="glyphicon glyphicon-ok filter-active"></span></a> </li>
+                <li><a href="{% facet_remove_all 'missing' %}" class="{% facet_has_selection param='missing' %}"><span class="glyphicon glyphicon-remove"></span>Remove Filter </a> </li>
+            </ul>
         </div>
 
     {% if letter %}
@@ -37,7 +43,11 @@ <h3>Showing Surnames beginning with '{{ letter|upper }}'</h3>
                     <a href="{% url 'show-person' person.slug %}">{{ person.name }}</a>
                 </td>
                 <td>
+                    {% if person.bio %}
                     {{ person.bio }}
+                    {% else %}
+                    <i>N/A</i>
+                    {% endif %}
                 </td>
                 <td>
                     {% if perms.events.change_person %}

talks/templates/events/person.html

@@ -12,7 +12,9 @@ <h3 class="panel-title">{{ person.name }}</h3>
     </div>
     <div class="panel-body">
         <a class="pull-right btn btn-default" role="button" href="{% url 'edit-person' person.slug %}">edit</a>
+        {% if person.bio %}
         <p>{{ person.bio }}</p>
+        {% endif %}
         {% if person.web_address %}
         <p><a href="{{ person.web_address }}" target="_blank">{{ person.web_address }}</a></p>
         {% endif %}