Changeset b8172c8 for asadb/groups

Timestamp:

Mar 28, 2013, 6:16:41 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

870992c

Parents:

5260840 (diff), c3a5618 (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@…> (03/28/13 06:16:41)

git-committer:

Alex Dehnert <adehnert@…> (03/28/13 06:16:41)

Message:

Merge branch 'midway'

• midway: Handle duplicate groups Fix spelling of midway permission Add the midway permissions to the asa-ebm group Allow running diff_static_data from any directory Add Midway map link to front page Allow sorting and filtering the midway page Sort imports more Basic list of groups at the midway WIP: midway page WIP: Midway

Location:

asadb/groups

Files:

• models.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

asadb/groups/models.py

@@ -1 @@
-from django.conf import settings
-from django.db import models
-from django.core.validators import RegexValidator
-from django.contrib.auth.models import User
-from django.template.defaultfilters import slugify
-import reversion
-
 import datetime
 import filecmp
@@ -16 +9 @@
 import urllib
 import urllib2
+
+from django.conf import settings
+from django.db import models
+from django.core.validators import RegexValidator
+from django.contrib.auth.models import User
+from django.template.defaultfilters import slugify
+
+import reversion
 
 import mit

asadb/groups/views.py

@@ -4 +4 @@
 import csv
 import datetime
-
-import groups.models
 
 from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
@@ -30 +28 @@
 import django_filters
 
+import groups.models
 from util.db_form_utils import StaticWidget
 import util.db_filters