Changeset ecf87c8 for asadb/util/diff_static_data.sh

Timestamp:

Jun 5, 2013, 5:53:11 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

17c118f

Parents:

242566d (diff), 72a3d90 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (06/05/13 05:53:05)

git-committer:

Alex Dehnert <adehnert@…> (06/05/13 05:53:11)

Message:

Merge branch 'space-access'

This branch was created to fix ASA-#96 ("Differentiate between spaces CAC does
and does not manage access to"), but also fixes a wide variety of other
space-related issues.

• space-access: (23 commits) Fill in the office access timeframe Fix grammar ({e,a}ffect) Punt another spurious slash Use "Space Access" more consistently Add "Details" link to "Space access" page Rename 50-030 to 50-032 and set its lock type Space: tell groups CAC should reply (ASA-#235) Warn people off the "Space access" page (ASA-#233) Don't let people edit spaces the DB doesn't manage More Walker rooms Correct Walker room access Add info_url to the admin Incorporate feedback from CAC Update the space emails with non-DB-managed info Comment space/diffs.py's locker code a bit better Show lock types on manage access page Describe the lock types and list on space summary Add list of lock types and assign them to rooms Use pagename "groups", not "group" WIP: more non-CAC space work ...

File:

• asadb/util/diff_static_data.sh (modified) (1 diff)

asadb/util/diff_static_data.sh

@@ -12 +12 @@
 ../../manage.py dumpdata --format=xml --indent=4 groups.ActivityCategory > groups_initial_data.xml
 ../../manage.py dumpdata --format=xml --indent=4 forms.FYSMCategory > forms_initial_data.xml
-git add {groups,forms}_initial_data.xml
+../../manage.py dumpdata --format=xml --indent=4 space.LockType --format=xml --indent=4 > space_lock_types.xml
+git add {groups,forms}_initial_data.xml space_lock_types.xml
 
 echo