Changeset 1ffd96e

Timestamp:

Dec 26, 2011, 5:18:13 AM (14 years ago)

Author:

asa-db <asa-db@…>

Branches:

master, space-access, stable, stage

Children:

beaf731

Parents:

be7c915 (diff), e499677 (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:

asa-db <asa-db@…> (12/26/11 05:18:13)

git-committer:

asa-db <asa-db@…> (12/26/11 05:18:13)

Message:

Merge branch 'master' of /mit/asa-db/Scripts/django/../git/asa-db

Files:

• asadb/groups/migrations/0018_recognition_datetime.py (added)
• asadb/groups/models.py (modified) (1 diff)
• asadb/groups/views.py (modified) (1 diff)
• asadb/media/style/style.css (modified) (1 diff)
• asadb/mit/__init__.py (modified) (1 diff)
• asadb/settings.py (modified) (2 diffs)
• asadb/template/groups/group_detail.html (modified) (2 diffs)
• asadb/template/groups/group_list.html (modified) (2 diffs)
• asadb/template/groups/groups_signatories.html (modified) (1 diff)
• asadb/util/export_website_groups.py (added)
• asadb/util/sync_moira_authz.py (added)
• asadb/util/sync_moira_authz.sh (added)
• design/stakeholders/2011-12-13-demo.txt (added)
• asadb/groups/migrations/0006_add_group_perms.py (modified) (1 diff)
• asadb/groups/migrations/0014_recognize_nge_perm.py (modified) (1 diff)
• asadb/groups/migrations/0016_create_auth_groups.py (modified) (1 diff)

asadb/groups/models.py

@@ -35 +35 @@
     funding_account_id = models.IntegerField(null=True, blank=True, )
     athena_locker = models.CharField(max_length=20, blank=True)
-    recognition_date = models.DateField()
+    recognition_date = models.DateTimeField()
     update_date = models.DateTimeField(editable=False, )
     updater = models.CharField(max_length=30, editable=False, null=True, ) # match Django username field

asadb/groups/views.py

@@ -483 +483 @@
             group.group_status = groups.models.GroupStatus.objects.get(slug='active')
             group.constitution_url = ""
-            group.recognition_date = datetime.date.today()
+            group.recognition_date = datetime.datetime.now()
             group.set_updater(request.user)
 

asadb/media/style/style.css

@@ -220 +220 @@
 }
 
+tr.group-status-active.group-active-True td.group-status
+{
+    background-color: green;
+    color: black;
+}
+tr.group-active-True td.group-status
+{
+    background-color: yellow;
+    color: black;
+}
+tr.group-active-False td.group-status
+{
+    background-color: red;
+    color: black;
+}
+
 
 /* Reset some stuff */

asadb/mit/__init__.py

@@ -56 +56 @@
         return user
 
+def get_or_create_mit_user(username, ):
+    """
+    Given an MIT username, return a Django user object for them.
+    If necessary, create (and save) the Django user for them.
+    If the MIT user doesn't exist, raises ValueError.
+    """
+    user, created = auth.models.User.objects.get_or_create(username=username, )
+    if created:
+        backend = ScriptsRemoteUserBackend()
+        # Raises ValueError if the user doesn't exist
+        try:
+            return backend.configure_user(user), created
+        except ValueError:
+            user.delete()
+            raise
+    else:
+        return user, created
+
 def scripts_login(request, **kwargs):
     host = request.META['HTTP_HOST'].split(':')[0]

asadb/settings.py

@@ -23 +23 @@
 DATABASES = {}
 
+KRB_KEYTAB = None
+KRB_PRINCIPAL = None
+
 ENABLE_SCRIPTS_AUTH = True
 
+COOKIES_PREFIX = "asadb_"
 SESSION_COOKIE_SECURE = True
 SESSION_COOKIE_HTTPONLY = True
@@ -50 +54 @@
 
 from local_settings import *
+
+SESSION_COOKIE_NAME = COOKIES_PREFIX + "sessionid"
+CSRF_COOKIE_NAME = COOKIES_PREFIX + "csrftoken"
 
 # Absolute path to the directory that holds media.

asadb/template/groups/group_detail.html

@@ -25 +25 @@
 <tr><th>Website</th><td><a href="{{group.website_url}}">{{group.website_url}}</a></td></tr>
 <tr><th>Meeting times</th><td>{{group.meeting_times}}</td></tr>
-<tr><th>Officer email</th><td>redacted-temporarily@mit.edu</td></tr>
+<tr><th>Officer email</th><td>{% if user.is_authenticated %}{{group.officer_email}}{% else %}[log in to see emails]{% endif %}</td></tr>
 {% if viewpriv %}<tr class='private-info'>
     <th>Group email</th>
@@ -36 +36 @@
     <th>{{name}}{%if not role.publicly_visible %}*{%endif%}</th>
     <td><ul>
-    {% for person in people %}<li>[redacted temporarily]</li>{%endfor%}
+    {% for person in people %}<li>{{person.person}}</li>{%endfor%}
     </ul></td>
 </tr>

asadb/template/groups/group_list.html

@@ -17 +17 @@
 <h2>The Groups</h2>
 
-<table class='pretty-table'>
+<table class='pretty-table group-list'>
 <thead>
     <tr>
         <th>Name</th>
+        <th>Status</th>
         <th>Website</th>
         <th>ASA DB</th>
@@ -29 +30 @@
 <tbody>
 {% for group in group_list %}
-    <tr>
+    <tr class='group-status-{{group.group_status.slug}} group-active-{{group.group_status.is_active}}'>
         <th>{{group.name}}</th>
+        <td class='group-status'>{{group.group_status}}</td>
         <td>{% if group.website_url %}<a href='{{group.website_url}}'>Website</a>{%endif%}</td>
         <td><a href='{% url groups:group-detail group.pk %}'>DB Entry</a></td>

asadb/template/groups/groups_signatories.html

@@ -29 +29 @@
 {%for group, role_list in officers %}
 <tr>
-    <th><a href='{% url groups:group-detail group.pk %}'>{{group}}</a></th>
+    <th><a href='{% url groups:group-detail group.pk %}'>{{group}}</a> ({{group.group_status}})</th>
     {%for holders in role_list%}
     <td>{% if holders %}<ul>{% for person in holders %}<li>{{person}}</li>{%endfor%}</ul>{% endif %}</td>

asadb/groups/migrations/0006_add_group_perms.py

@@ -14 +14 @@
     def forwards(self, orm):
         "Write your forwards methods here."
+        # Create the various contenttypes and permissions and stuff
+        # Otherwise the we'll end with a group without a name
+        # http://groups.google.com/group/south-users/browse_thread/thread/666994cabad1a185?pli=1
+        db.send_pending_create_signals()
+
         # See http://stackoverflow.com/questions/1742021/adding-new-custom-permissions-in-django#answer-6149593
         ct, created = orm['contenttypes.ContentType'].objects.get_or_create(model='group', app_label='groups') # model must be lowercase!

asadb/groups/migrations/0014_recognize_nge_perm.py

@@ -24 +24 @@
     def forwards(self, orm):
         "Write your forwards methods here."
+        # Create the various contenttypes and permissions and stuff
+        # Otherwise the permission stuff will fail horribly
+        # http://groups.google.com/group/south-users/browse_thread/thread/666994cabad1a185?pli=1
+        db.send_pending_create_signals()
+
         util.migrations.migrate_perms_forwards(orm, self.new_perms, )
         util.migrations.migrate_groups_forwards(orm, self.new_auth_groups, )

asadb/groups/migrations/0016_create_auth_groups.py

@@ -74 +74 @@
 
 class Migration(DataMigration):
+
+    depends_on = (
+        ("forms", "0001_initial", ),
+    )
+
     def forwards(self, orm):
         "Write your forwards methods here."
+        db.send_pending_create_signals()
         util.migrations.migrate_groups_forwards(orm, auth_groups, )
         user_manager = django.contrib.auth.models.User.objects