Changeset 2919697 for asadb/template/groups

Timestamp:

Oct 23, 2011, 3:36:38 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

86d9174

Parents:

96c5790

git-author:

Alex Dehnert <adehnert@…> (10/23/11 05:59:20)

git-committer:

Alex Dehnert <adehnert@…> (10/23/11 15:36:38)

Message:

More work on group recognition forms

Location:

asadb/template/groups

Files:

• create/err.not-applying.html (added)
• create/nge.html (added)
• create/startup.html (added)
• create/startup_review.html (added)
• create/startup_thanks.html (added)
• diffs/new-group-accounts.txt (modified) (1 diff)
• group_create.html (deleted)
• groupstartup_list.html (added)

asadb/template/groups/diffs/new-group-accounts.txt

@@ -8 +8 @@
 Please create the following resources:
 
-{% if "athena_locker" in formdata.create_which and group.athena_locker %}
+{% if create_athena_locker %}
   Activity Locker under /afs/athena/activity/: {{group.athena_locker}}
-      User owner  : {{formdata.president}}
-      Group owner : {{group.officer_email}}
+      User owner  : {{group_startup.president_kerberos}}
+      Group owner : {{officer_list}}
 
-{% endif %}{% if "officer_email" in formdata.create_which %}
-  List : {{group.officer_email}}
+{% endif %}{% if create_officer_list %}
+  List : {{officer_list}}
       Group         : Yes
       Mailing List  : Yes
       Administrator : self
-      Members       : {{formdata.president}}
+      Members       : {{group_startup.president_kerberos}}
 
-{% endif %}{% if "group_email" in formdata.create_which and group.group_email %}
-  List : {{group.group_email}}
+{% endif %}{% if create_group_list %}
+  List : {{group_list}}
       Group         : Yes
       Mailing List  : Yes
-      Administrator : {{group.officer_email}}
-      Members       : {{formdata.president}}
+      Administrator : {{officer_list}}
+      Members       : {{group_startup.president_kerberos}}
 {% endif %}
 
 Please send confirmation of the completion to
-   {{formdata.president}}
+   {{officer_emails|join:", "}}
 and
    asa-admin@mit.edu