Merge branch 'feature/change-committees-to-activemembers' into 'master'

Change committees to activemembers



See merge request !63

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/models.py → website/activemembers/models.py

@@ -81,7 +81,7 @@ class Committee(models.Model):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('committees:details', args=[str(self.pk)])
+        return reverse('activemembers:details', args=[str(self.pk)])
 
     class Meta:
         verbose_name = _('committee')

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/activemembers/js/boards.js

@@ -7,7 +7,7 @@ $(document).ready(function(){
     $(".bestuur-list").hide();
     $("#board" + 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();
     $("#board" + 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();
     $("#board" + 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/");
 });