Merge lp:~vorlon/summit/social-media-configurable into lp:summit

[Steve Langasek]

Let social media links be turned o/off on a per-summit basis.

DebConf does not want social media links on its summit instance, in part because these involve loading javascript from third-party sites. Let these links be turned o/off on a per-summit basis.

[lp:~vorlon/summit/social-media-configurable]

569. By Steve Langasek on 2014-05-04

Add test cases showing that the social_media flag DTRT

[Michael Hall (mhall119)]

Looks good, tests pass, thanks for the patch

review: Approve

=== added file 'summit/schedule/migrations/0030_auto__add_field_summit_social_media.py'
--- summit/schedule/migrations/0030_auto__add_field_summit_social_media.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0030_auto__add_field_summit_social_media.py	2014-05-04 07:06:48 +0000
@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Summit.social_media'
+        db.add_column('schedule_summit', 'social_media',
+                      self.gf('django.db.models.fields.BooleanField')(default=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Summit.social_media'
+        db.delete_column('schedule_summit', 'social_media')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'ordering': "['username']", 'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.agenda': {
+            'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
+            'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
+        },
+        'schedule.attendee': {
+            'Meta': {'ordering': "('user__username', 'summit')", 'object_name': 'Attendee'},
+            'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'schedule.attendeebusy': {
+            'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.crew': {
+            'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
+            'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'schedule.lead': {
+            'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
+            'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'broadcast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'hangout_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'launchpad_blueprint_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '100'}),
+            'override_break': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "orm['schedule.Participant']", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'discussion'", 'max_length': '15'}),
+            'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'virtual_meeting': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'ordering': "('meeting', 'attendee', 'participation')", 'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'from_launchpad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'participation': ('django.db.models.fields.CharField', [], {'default': "'ATTENDING'", 'max_length': '32', 'null': 'True'})
+        },
+        'schedule.room': {
+            'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.roombusy': {
+            'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.slot': {
+            'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.summit': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
+            'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'help_text': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'sites': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sites.Site']", 'symmetrical': 'False'}),
+            'social_media': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
+            'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'virtual_summit': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'schedule.summitsprint': {
+            'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
+        },
+        'schedule.track': {
+            'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
+            'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'sites.site': {
+            'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['schedule']
\ No newline at end of file

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2013-05-14 01:43:55 +0000
+++ summit/schedule/models/summitmodel.py	2014-05-04 07:06:48 +0000
@@ -130,6 +130,10 @@
         blank=True,
         help_text='Instructions and links for getting help during the event'
     )
+    social_media = models.BooleanField(
+        default=True,
+        help_text='Enable social media links for the summit'
+    )
 
     objects = models.Manager()
     on_site = SummitManager()

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2013-11-06 02:25:41 +0000
+++ summit/schedule/templates/schedule/meeting.html	2014-05-04 07:06:48 +0000
@@ -81,8 +81,7 @@
 
 </section>
 <article class="span-3 last">
-{% if meeting.private %}
-{% else %}
+{% if not meeting.private and summit.social_media %}
 <div class="share">
     <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px;"src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" border="0" /></a><br />
     <div id="fb-root"></div>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2014-04-13 21:50:21 +0000
+++ summit/schedule/templates/schedule/summit.html	2014-05-04 07:06:48 +0000
@@ -53,6 +53,7 @@
         {% endif %}
     </section>
     <article class="span-4 last">
+{% if summit.social_media %}
         <div class="share alone">
             <a href="http://www.reddit.com/submit" onclick="window.location = 'http://www.reddit.com/submit?url=' + encodeURIComponent(window.location); return false"> <img style="padding-bottom: 4px; border: 0;" src="http://www.reddit.com/static/spreddit7.gif" alt="submit to reddit" /></a><br />
             <div id="fb-root"></div>
@@ -70,6 +71,7 @@
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
             <script src="http://www.stumbleupon.com/hostedbadge.php?s=5"></script>
         </div>
+{% endif %}
     </article>
 </div>
 <div class="row">

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-11-06 02:25:41 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2014-05-04 07:06:48 +0000
@@ -72,8 +72,7 @@
         {% for ai in agenda_items %}
             <h3>{{ ai.slot }} in {{ ai.room.title }}</h3>
         {% endfor %}
-        {% if meeting.private %}
-        {% else %}
+        {% if not meeting.private and summit.social_media %}
             <div class="share">
                 <div id="fb-root"></div>
                 <script>(function(d, s, id) {

=== modified file 'summit/schedule/tests/summit_model.py'
--- summit/schedule/tests/summit_model.py	2013-05-09 20:15:49 +0000
+++ summit/schedule/tests/summit_model.py	2014-05-04 07:06:48 +0000
@@ -642,3 +642,25 @@
         summit = self.create_summit()
         response = self.load_summit_page(summit)
         self.assertNotContains(response, "Launchpad information")
+
+    def test_summit_page_displays_social_media(self):
+        """
+        Tests that the summit main page displays the social media links when
+        social_media=True
+        """
+        summit = self.create_summit()
+        summit.social_media=True
+        summit.save()
+        response = self.load_summit_page(summit)
+        self.assertContains(response, "http://www.reddit.com/submit")
+
+    def test_summit_page_does_not_display_social_media(self):
+        """
+        Tests that the summit main page does not display the social media
+        links when social_media=False
+        """
+        summit = self.create_summit()
+        summit.social_media=False
+        summit.save()
+        response = self.load_summit_page(summit)
+        self.assertNotContains(response, "http://www.reddit.com/submit")