Changeset 628e06c

Timestamp:

Aug 9, 2011, 2:12:06 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

9b911db

Parents:

3cad159

git-author:

Alex Dehnert <adehnert@…> (08/09/11 02:08:41)

git-committer:

Alex Dehnert <adehnert@…> (08/09/11 02:12:06)

Message:

Sync the "view group" and "edit group" pages

This really makes me wonder whether I should be making them use the same code,
rather than just looking the same...

Location:

asadb

Files:

• groups/views.py (modified) (3 diffs)
• template/groups/group_detail.html (modified) (2 diffs)

asadb/groups/views.py

@@ -31 +31 @@
             del kwargs['change_restricted']
         super(GroupChangeMainForm, self).__init__(*args, **kwargs)
+        restricted_fields = list(self.nobody_fields)
         if change_restricted:
-            for field_name in self.exec_only_fields:
-                value = getattr(self.instance, field_name)
-                formfield = self.fields[field_name]
-                formfield.widget = StaticWidget(value=value)
+            restricted_fields.extend(self.exec_only_fields)
+        for field_name in restricted_fields:
+            value = getattr(self.instance, field_name)
+            formfield = self.fields[field_name]
+            formfield.widget = StaticWidget(value=value)
 
     exec_only_fields = [
         'name', 'abbreviation',
-        'athena_locker',
+        'group_status', 'group_class',
+        'group_funding', 'main_account_id', 'funding_account_id',
+    ]
+    nobody_fields = [
+        'recognition_date', 'updater', 'update_date',
     ]
 
@@ -46 +52 @@
             ('basic', {
                 'legend': 'Basic Information',
-                'fields': ['name', 'abbreviation', 'description', 'activity_category', ],
+                'fields': ['name', 'abbreviation', 'activity_category', 'description', ],
             }),
             ('size', {
@@ -54 +60 @@
             ('contact', {
                 'legend': 'Contact Information',
-                'fields': ['website_url', 'meeting_times', 'group_email', 'officer_email', ],
+                'fields': ['website_url', 'meeting_times', 'officer_email', 'group_email', ],
+            }),
+            ('recognition', {
+                'legend': 'Recognition',
+                'fields': ['group_status', 'group_class', 'recognition_date', ],
+            }),
+            ('financial', {
+                'legend': 'Financial Information',
+                'fields': ['group_funding', 'main_account_id', 'funding_account_id', ],
             }),
             ('more-info', {
                 'legend': 'Additional Information',
-                'fields': ['constitution_url', 'advisor_name', 'main_account_id', 'funding_account_id', 'athena_locker', 'recognition_date', ],
+                'fields': ['constitution_url', 'advisor_name', 'athena_locker', 'updater', 'update_date', ],
             }),
         ]

asadb/template/groups/group_detail.html

@@ -25 +25 @@
 </tr>{% endif %}
 
+<tr><th colspan='2'>Recognition</th></tr>
+<tr><th>Group status</th><td>{{group.group_status.name}}</td></tr>
+<tr><th>Group class</th><td>{{group.group_class.name}}</td></tr>
+<tr><th>Recognition date</th><td>{{group.recognition_date}}</td></tr>
+
+<tr><th colspan='2'>Financial Information</th></tr>
+<tr><th>Funding status</th><td>{{group.group_funding}}</td></tr>
+<tr><th>Main Account</th><td>{{group.main_account_id}}</td></tr>
+<tr><th>Funding Account</th><td>{{group.funding_account_id}}</td></tr>
+
 <tr><th colspan='2'>Additional Information</th></tr>
 <tr>
@@ -36 +46 @@
 <tr><th>Athena locker</th><td>{{group.athena_locker}}</td></tr>
 <tr><th>Last updated</th><td>{{group.update_date}} by {{group.updater}}</td></tr>
-
-<tr><th colspan='2'>Recognition</th></tr>
-<tr><th>Group status</th><td>{{group.group_status.name}}</td></tr>
-<tr><th>Group class</th><td>{{group.group_class.name}}</td></tr>
-<tr><th>Recognition date</th><td>{{group.recognition_date}}</td></tr>
-
-<tr><th colspan='2'>Financial Information</th></tr>
-<tr><th>Funding status</th><td>{{group.group_funding}}</td></tr>
-<tr><th>Main Account</th><td>{{group.main_account_id}}</td></tr>
-<tr><th>Funding Account</th><td>{{group.funding_account_id}}</td></tr>
 
 {% if viewpriv %}