Large invasive change of renaming 'committees' to 'activemembers'

website/committees/apps.py → website/activemembers/apps.py

 from django.apps import AppConfig
 
 
-class CommitteesConfig(AppConfig):
-    name = 'committees'
+class ActiveMembersConfig(AppConfig):
+    name = 'activemembers'

website/committees/fixtures/committees.json → website/activemembers/fixtures/committees.json

 [
 {
-    "model": "committees.committee",
+    "model": "activemembers.committee",
     "pk": 1,
     "fields": {
         "name": "testcie1",
@@ -14,7 +14,7 @@
     }
 },
 {
-    "model": "committees.committee",
+    "model": "activemembers.committee",
     "pk": 2,
     "fields": {
         "name": "testcie2",

website/committees/migrations/0001_squashed_0006_auto_20160707_1700.py → website/activemembers/migrations/0001_squashed_0006_auto_20160707_1700.py

@@ -9,7 +9,7 @@ import django.db.models.manager
 
 class Migration(migrations.Migration):
 
-    replaces = [('committees', '0001_initial'), ('committees', '0002_committee_permissions'), ('committees', '0003_auto_20160707_1356'), ('committees', '0004_auto_20160707_1357'), ('committees', '0005_auto_20160707_1512'), ('committees', '0006_auto_20160707_1700')]
+    replaces = [('activemembers', '0001_initial'), ('activemembers', '0002_committee_permissions'), ('activemembers', '0003_auto_20160707_1356'), ('activemembers', '0004_auto_20160707_1357'), ('activemembers', '0005_auto_20160707_1512'), ('activemembers', '0006_auto_20160707_1700')]
 
     initial = True
 
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
                 ('since', models.DateField(auto_now_add=True)),
                 ('until', models.DateField()),
                 ('chair', models.BooleanField()),
-                ('committee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='committees.Committee')),
+                ('committee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='activemembers.Committee')),
                 ('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='members.Member')),
             ],
             managers=[
@@ -45,7 +45,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='committee',
             name='members',
-            field=models.ManyToManyField(through='committees.CommitteeMembership', to='members.Member'),
+            field=models.ManyToManyField(through='activemembers.CommitteeMembership', to='members.Member'),
         ),
         migrations.AddField(
             model_name='committee',
@@ -68,7 +68,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='committeemembership',
             name='committee',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='committees.Committee', verbose_name='Committee'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='activemembers.Committee', verbose_name='Committee'),
         ),
         migrations.AlterField(
             model_name='committeemembership',

website/committees/migrations/0002_auto_20160713_1558.py → website/activemembers/migrations/0002_auto_20160713_1558.py

@@ -10,7 +10,7 @@ import django.db.models.manager
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0001_squashed_0006_auto_20160707_1700'),
+        ('activemembers', '0001_squashed_0006_auto_20160707_1700'),
     ]
 
     operations = [

website/committees/migrations/0003_auto_20160713_1700.py → website/activemembers/migrations/0003_auto_20160713_1700.py

@@ -9,17 +9,17 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0002_auto_20160713_1558'),
+        ('activemembers', '0002_auto_20160713_1558'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Board',
             fields=[
-                ('committee_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='committees.Committee')),
+                ('committee_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='activemembers.Committee')),
                 ('is_board', models.BooleanField(default=True, verbose_name='Is this a board')),
             ],
-            bases=('committees.committee',),
+            bases=('activemembers.committee',),
         ),
         migrations.AddField(
             model_name='committeemembership',

website/committees/migrations/0004_auto_20160727_2253.py → website/activemembers/migrations/0004_auto_20160727_2253.py

@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0003_auto_20160713_1700'),
+        ('activemembers', '0003_auto_20160713_1700'),
     ]
 
     operations = [

website/committees/migrations/0005_auto_20160813_2203.py → website/activemembers/migrations/0005_auto_20160813_2203.py

@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0004_auto_20160727_2253'),
+        ('activemembers', '0004_auto_20160727_2253'),
     ]
 
     operations = [

website/committees/migrations/0006_auto_20160817_2236.py → website/activemembers/migrations/0006_auto_20160817_2236.py

@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0005_auto_20160813_2203'),
+        ('activemembers', '0005_auto_20160813_2203'),
     ]
 
     operations = [

website/committees/migrations/0007_mentors.py → website/activemembers/migrations/0007_mentors.py

@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('members', '0006_auto_20160824_2041'),
-        ('committees', '0006_auto_20160817_2236'),
+        ('activemembers', '0006_auto_20160817_2236'),
     ]
 
     operations = [

website/committees/migrations/0008_auto_20160906_1015.py → website/activemembers/migrations/0008_auto_20160906_1015.py

@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('committees', '0007_mentors'),
+        ('activemembers', '0007_mentors'),
     ]
 
     operations = [

website/committees/sitemaps.py → website/activemembers/sitemaps.py

@@ -9,7 +9,7 @@ class StaticViewSitemap(sitemaps.Sitemap):
     changefreq = 'daily'
 
     def items(self):
-        return ['committees:index']
+        return ['activemembers:index']
 
     def location(self, item):
         return reverse(item)
@@ -35,7 +35,7 @@ class BoardSitemap(sitemaps.Sitemap):
 
 
 sitemap = {
-    'committees-static': StaticViewSitemap,
-    'committees-committees': CommitteeSitemap,
-    'committees-boards': BoardSitemap,
+    'activemembers-static': StaticViewSitemap,
+    'activemembers-committees': CommitteeSitemap,
+    'activemembers-boards': BoardSitemap,
 }

website/committees/static/committees/js/boards.js → website/activemembers/static/committees/js/boards.js

@@ -7,7 +7,7 @@ $(document).ready(function(){
     $(".bestuur-list").hide();
     $("#" + boardNr).show();
     $("#title").html(boardTitles[boardNr]);
-    window.history.pushState(boardNr, 'Title', '/association/committees/boards/' + boardNr);
+    window.history.pushState(boardNr, 'Title', '/association/activemembers/boards/' + boardNr);
 });
 
 $("#carousel-prev").click(function(){
@@ -24,7 +24,7 @@ $("#carousel-prev").click(function(){
     $(".bestuur-list").hide();
     $("#" + boardNr).show();
     $("#title").html(boardTitles[boardNr]);
-    window.history.pushState(boardNr, 'Title', '/association/committees/boards/' + boardNr);
+    window.history.pushState(boardNr, 'Title', '/association/activemembers/boards/' + boardNr);
     setTimeout(function(){blocked=false}, 500);
 });
 
@@ -44,7 +44,7 @@ $("#carousel-next").click(function(){
     $(".bestuur-list").hide();
     $("#" + boardNr).show();
     $("#title").html(boardTitles[boardNr]);
-    window.history.pushState(boardNr, 'Title', '/association/committees/boards/' + boardNr);
+    window.history.pushState(boardNr, 'Title', '/association/activemembers/boards/' + boardNr);
     setTimeout(function(){blocked=false}, 500);
 });
 
@@ -59,5 +59,5 @@ $(document).on('click', '#collectionButton', function(event) {
     $("#bestuurCarousel").hide();
     $("#ledenTitle").hide();
     $(".board-directory").hide();
-    window.history.pushState("board", "Title", "/association/committees/boards/");
+    window.history.pushState("board", "Title", "/association/activemembers/boards/");
 });

website/committees/tests.py → website/activemembers/tests.py

@@ -4,7 +4,7 @@ from django.db.utils import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
 
-from committees.models import Committee, CommitteeMembership
+from activemembers.models import Committee, CommitteeMembership
 from members.models import Member
 
 

website/committees/urls.py → website/activemembers/urls.py

 """
-Committees URL Configuration
+Activemembers URL Configuration
 """
 
 from django.conf.urls import url
@@ -7,7 +7,7 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.index, name='index'),
-    url(r'^details/(?P<committee_id>\d)/$', views.details, name='details'),
+    url(r'^committees$', views.committees, name='committees'),
+    url(r'^committees/(?P<committee_id>\d)/$', views.details, name='details'),
     url(r'^boards/(board-(?P<year>\d{4}-\d{4}))?$', views.boards, name='board'),
 ]

website/committees/views.py → website/activemembers/views.py

@@ -3,7 +3,7 @@ from django.shortcuts import render, get_object_or_404
 from .models import Committee, CommitteeMembership, Board
 
 
-def index(request):
+def committees(request):
     """Overview of committees"""
     committees = Committee.objects.all()
 

website/events/admin.py

@@ -8,7 +8,7 @@ from django.utils.http import is_safe_url
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
-from committees.models import Committee
+from activemembers.models import Committee
 from members.models import Member
 from . import models
 

website/events/migrations/0001_initial.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('members', '0004_auto_20160805_1435'),
-        ('committees', '0004_auto_20160727_2253'),
+        ('activemembers', '0004_auto_20160727_2253'),
     ]
 
     operations = [
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
                 ('registration_required', models.BooleanField(default=False, verbose_name='registration required')),
                 ('no_registration_message', models.CharField(blank=True, help_text='Default: No registration required', max_length=200, null=True, verbose_name='message when there is no registration')),
                 ('published', models.BooleanField(default=False, verbose_name='published')),
-                ('organiser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='committees.Committee')),
+                ('organiser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='activemembers.Committee')),
             ],
             options={
                 'ordering': ('-start',),

website/events/migrations/0002_auto_20160813_1620.py

@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='organiser',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='committees.Committee'),
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='activemembers.Committee'),
         ),
     ]

website/events/models.py

@@ -20,7 +20,7 @@ class Event(models.Model):
     end = models.DateTimeField(_("end time"))
 
     organiser = models.ForeignKey(
-        'committees.Committee',
+        'activemembers.Committee',
         models.SET_NULL,
         null=True,
     )

website/mailinglists/migrations/0001_initial.py

@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('committees', '0004_auto_20160727_2253'),
+        ('activemembers', '0004_auto_20160727_2253'),
         ('members', '0003_merge_20160727_2333'),
     ]
 
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
                 ('prefix', models.CharField(max_length=200)),
                 ('archived', models.BooleanField(default=True)),
                 ('moderated', models.BooleanField(default=False)),
-                ('committees', models.ManyToManyField(blank=True, to='committees.Committee')),
+                ('committees', models.ManyToManyField(blank=True, to='activemembers.Committee')),
                 ('members', models.ManyToManyField(blank=True, to='members.Member')),
             ],
         ),

website/mailinglists/models.py

@@ -3,7 +3,7 @@ from django.core import validators
 from django.utils.translation import ugettext_lazy as _
 
 from members.models import Member
-from committees.models import Committee
+from activemembers.models import Committee
 
 
 class MailingList(models.Model):

website/mailinglists/views.py

@@ -4,7 +4,7 @@ from django.http import Http404
 
 from .models import MailingList
 from members.models import Member
-from committees.models import CommitteeMembership
+from activemembers.models import CommitteeMembership
 
 import hashlib
 

website/thaliawebsite/menus.py

@@ -3,8 +3,8 @@ from django.utils.translation import ugettext_lazy as _
 main = [
     {'title': _('Home'), 'name': 'index'},
     {'title': _('Association'), 'name': '#', 'submenu': [
-        {'title': _('Board'), 'name': '#'},
-        {'title': _('Committees'), 'name': 'committees:index'},
+        {'title': _('Board'), 'name': 'activemembers:board'},
+        {'title': _('Committees'), 'name': 'activemembers:committees'},
         {'title': _('Members'), 'name': 'members:index'},
         {'title': _('Documents'), 'name': 'documents:index'},
         {'title': _('Merchandise'), 'name': 'merchandise:index'},

website/thaliawebsite/settings/settings.py

@@ -51,7 +51,7 @@ INSTALLED_APPS = [
     'thaliawebsite',  # include for admin settings
     'members',
     'documents',
-    'committees',
+    'activemembers',
     'photos',
     'utils',
     'mailinglists',
@@ -129,7 +129,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
-    'committees.backends.CommitteeBackend',
+    'activemembers.backends.CommitteeBackend',
 ]
 
 # Internationalization

website/thaliawebsite/urls.py

@@ -26,7 +26,7 @@ from utils.views import private_thumbnails
 import members
 
 from .sitemaps import StaticViewSitemap
-from committees.sitemaps import sitemap as committees_sitemap
+from activemembers.sitemaps import sitemap as activemembers_sitemap
 from members.sitemaps import sitemap as members_sitemap
 from documents.sitemaps import sitemap as documents_sitemap
 from thabloid.sitemaps import sitemap as thabloid_sitemap
@@ -35,7 +35,7 @@ from partners.sitemaps import sitemap as partners_sitemap
 thalia_sitemap = {
     'main-static': StaticViewSitemap,
 }
-thalia_sitemap.update(committees_sitemap)
+thalia_sitemap.update(activemembers_sitemap)
 thalia_sitemap.update(members_sitemap)
 thalia_sitemap.update(documents_sitemap)
 thalia_sitemap.update(thabloid_sitemap)
@@ -51,7 +51,7 @@ urlpatterns = [
     url(r'^newsletters/', include('newsletters.urls',
                                   namespace='newsletters')),
     url(r'^association/', include([
-        url(r'^committees/', include('committees.urls', namespace='committees')),
+        url(r'^activemembers/', include('activemembers.urls', namespace='activemembers')),
         url(r'^merchandise/', include('merchandise.urls', namespace='merchandise')),
         url(r'^documents/', include('documents.urls', namespace='documents')),
         url(r'^become-a-member/', members.views.become_a_member, name='become-a-member'),