Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
b0f451c8
Commit
b0f451c8
authored
Sep 06, 2016
by
Sébastiaan Versteeg
Browse files
Large invasive change of renaming 'committees' to 'activemembers'
parent
0191629a
Changes
36
Hide whitespace changes
Inline
Side-by-side
website/
committee
s/__init__.py
→
website/
activemember
s/__init__.py
View file @
b0f451c8
File moved
website/
committee
s/admin.py
→
website/
activemember
s/admin.py
View file @
b0f451c8
File moved
website/
committee
s/apps.py
→
website/
activemember
s/apps.py
View file @
b0f451c8
from
django.apps
import
AppConfig
class
Committee
sConfig
(
AppConfig
):
name
=
'
committee
s'
class
ActiveMember
sConfig
(
AppConfig
):
name
=
'
activemember
s'
website/
committee
s/backends.py
→
website/
activemember
s/backends.py
View file @
b0f451c8
File moved
website/
committee
s/fixtures/committees.json
→
website/
activemember
s/fixtures/committees.json
View file @
b0f451c8
[
{
"model"
:
"
committee
s.committee"
,
"model"
:
"
activemember
s.committee"
,
"pk"
:
1
,
"fields"
:
{
"name"
:
"testcie1"
,
...
...
@@ -14,7 +14,7 @@
}
},
{
"model"
:
"
committee
s.committee"
,
"model"
:
"
activemember
s.committee"
,
"pk"
:
2
,
"fields"
:
{
"name"
:
"testcie2"
,
...
...
website/
committee
s/locale/nl/LC_MESSAGES/django.mo
→
website/
activemember
s/locale/nl/LC_MESSAGES/django.mo
View file @
b0f451c8
File moved
website/
committee
s/locale/nl/LC_MESSAGES/django.po
→
website/
activemember
s/locale/nl/LC_MESSAGES/django.po
View file @
b0f451c8
File moved
website/
committee
s/migrations/0001_squashed_0006_auto_20160707_1700.py
→
website/
activemember
s/migrations/0001_squashed_0006_auto_20160707_1700.py
View file @
b0f451c8
...
...
@@ -9,7 +9,7 @@ import django.db.models.manager
class
Migration
(
migrations
.
Migration
):
replaces
=
[(
'
committee
s'
,
'0001_initial'
),
(
'
committee
s'
,
'0002_committee_permissions'
),
(
'
committee
s'
,
'0003_auto_20160707_1356'
),
(
'
committee
s'
,
'0004_auto_20160707_1357'
),
(
'
committee
s'
,
'0005_auto_20160707_1512'
),
(
'
committee
s'
,
'0006_auto_20160707_1700'
)]
replaces
=
[(
'
activemember
s'
,
'0001_initial'
),
(
'
activemember
s'
,
'0002_committee_permissions'
),
(
'
activemember
s'
,
'0003_auto_20160707_1356'
),
(
'
activemember
s'
,
'0004_auto_20160707_1357'
),
(
'
activemember
s'
,
'0005_auto_20160707_1512'
),
(
'
activemember
s'
,
'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
=
'
committee
s.Committee'
)),
(
'committee'
,
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
to
=
'
activemember
s.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
=
'
committee
s.CommitteeMembership'
,
to
=
'members.Member'
),
field
=
models
.
ManyToManyField
(
through
=
'
activemember
s.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
=
'
committee
s.Committee'
,
verbose_name
=
'Committee'
),
field
=
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
to
=
'
activemember
s.Committee'
,
verbose_name
=
'Committee'
),
),
migrations
.
AlterField
(
model_name
=
'committeemembership'
,
...
...
website/
committee
s/migrations/0002_auto_20160713_1558.py
→
website/
activemember
s/migrations/0002_auto_20160713_1558.py
View file @
b0f451c8
...
...
@@ -10,7 +10,7 @@ import django.db.models.manager
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0001_squashed_0006_auto_20160707_1700'
),
(
'
activemember
s'
,
'0001_squashed_0006_auto_20160707_1700'
),
]
operations
=
[
...
...
website/
committee
s/migrations/0003_auto_20160713_1700.py
→
website/
activemember
s/migrations/0003_auto_20160713_1700.py
View file @
b0f451c8
...
...
@@ -9,17 +9,17 @@ import django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0002_auto_20160713_1558'
),
(
'
activemember
s'
,
'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
=
'
committee
s.Committee'
)),
(
'committee_ptr'
,
models
.
OneToOneField
(
auto_created
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
parent_link
=
True
,
primary_key
=
True
,
serialize
=
False
,
to
=
'
activemember
s.Committee'
)),
(
'is_board'
,
models
.
BooleanField
(
default
=
True
,
verbose_name
=
'Is this a board'
)),
],
bases
=
(
'
committee
s.committee'
,),
bases
=
(
'
activemember
s.committee'
,),
),
migrations
.
AddField
(
model_name
=
'committeemembership'
,
...
...
website/
committee
s/migrations/0004_auto_20160727_2253.py
→
website/
activemember
s/migrations/0004_auto_20160727_2253.py
View file @
b0f451c8
...
...
@@ -8,7 +8,7 @@ from django.db import migrations, models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0003_auto_20160713_1700'
),
(
'
activemember
s'
,
'0003_auto_20160713_1700'
),
]
operations
=
[
...
...
website/
committee
s/migrations/0005_auto_20160813_2203.py
→
website/
activemember
s/migrations/0005_auto_20160813_2203.py
View file @
b0f451c8
...
...
@@ -8,7 +8,7 @@ from django.db import migrations, models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0004_auto_20160727_2253'
),
(
'
activemember
s'
,
'0004_auto_20160727_2253'
),
]
operations
=
[
...
...
website/
committee
s/migrations/0006_auto_20160817_2236.py
→
website/
activemember
s/migrations/0006_auto_20160817_2236.py
View file @
b0f451c8
...
...
@@ -8,7 +8,7 @@ from django.db import migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0005_auto_20160813_2203'
),
(
'
activemember
s'
,
'0005_auto_20160813_2203'
),
]
operations
=
[
...
...
website/
committee
s/migrations/0007_mentors.py
→
website/
activemember
s/migrations/0007_mentors.py
View file @
b0f451c8
...
...
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
dependencies
=
[
(
'members'
,
'0006_auto_20160824_2041'
),
(
'
committee
s'
,
'0006_auto_20160817_2236'
),
(
'
activemember
s'
,
'0006_auto_20160817_2236'
),
]
operations
=
[
...
...
website/
committee
s/migrations/0008_auto_20160906_1015.py
→
website/
activemember
s/migrations/0008_auto_20160906_1015.py
View file @
b0f451c8
...
...
@@ -8,7 +8,7 @@ from django.db import migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
committee
s'
,
'0007_mentors'
),
(
'
activemember
s'
,
'0007_mentors'
),
]
operations
=
[
...
...
website/
committee
s/migrations/__init__.py
→
website/
activemember
s/migrations/__init__.py
View file @
b0f451c8
File moved
website/
committee
s/models.py
→
website/
activemember
s/models.py
View file @
b0f451c8
File moved
website/
committee
s/sitemaps.py
→
website/
activemember
s/sitemaps.py
View file @
b0f451c8
...
...
@@ -9,7 +9,7 @@ class StaticViewSitemap(sitemaps.Sitemap):
changefreq
=
'daily'
def
items
(
self
):
return
[
'
committee
s:index'
]
return
[
'
activemember
s:index'
]
def
location
(
self
,
item
):
return
reverse
(
item
)
...
...
@@ -35,7 +35,7 @@ class BoardSitemap(sitemaps.Sitemap):
sitemap
=
{
'
committee
s-static'
:
StaticViewSitemap
,
'
committee
s-committees'
:
CommitteeSitemap
,
'
committee
s-boards'
:
BoardSitemap
,
'
activemember
s-static'
:
StaticViewSitemap
,
'
activemember
s-committees'
:
CommitteeSitemap
,
'
activemember
s-boards'
:
BoardSitemap
,
}
website/
committee
s/static/committees/images/logo-black-bg.png
→
website/
activemember
s/static/committees/images/logo-black-bg.png
View file @
b0f451c8
File moved
website/
committee
s/static/committees/js/boards.js
→
website/
activemember
s/static/committees/js/boards.js
View file @
b0f451c8
...
...
@@ -7,7 +7,7 @@ $(document).ready(function(){
$
(
"
.bestuur-list
"
).
hide
();
$
(
"
#
"
+
boardNr
).
show
();
$
(
"
#title
"
).
html
(
boardTitles
[
boardNr
]);
window
.
history
.
pushState
(
boardNr
,
'
Title
'
,
'
/association/
committee
s/boards/
'
+
boardNr
);
window
.
history
.
pushState
(
boardNr
,
'
Title
'
,
'
/association/
activemember
s/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/
committee
s/boards/
'
+
boardNr
);
window
.
history
.
pushState
(
boardNr
,
'
Title
'
,
'
/association/
activemember
s/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/
committee
s/boards/
'
+
boardNr
);
window
.
history
.
pushState
(
boardNr
,
'
Title
'
,
'
/association/
activemember
s/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/
committee
s/boards/
"
);
window
.
history
.
pushState
(
"
board
"
,
"
Title
"
,
"
/association/
activemember
s/boards/
"
);
});
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment