Changeset 6fc0921 for asadb/util

Timestamp:

Nov 17, 2011, 5:28:01 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

283099c

Parents:

728cafa (diff), 29a7eca (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@…> (11/17/11 17:28:01)

git-committer:

Alex Dehnert <adehnert@…> (11/17/11 17:28:01)

Message:

Merge branch 'new-db'

Location:

asadb/util

Files:

• db_form_utils.py (modified) (1 diff)
• emailbackend.py (added)
• emails.py (added)
• mailman.py (added)
• migrations.py (added)
• diff_static_data.sh (added)
• dump_group_perms.py (added)
• warehouse-refresh.sh (modified) (2 diffs)

asadb/util/db_form_utils.py

@@ -26 +26 @@
 
     def value_from_datadict(self, data, files, name, ):
+        for choice_value, choice_label in self.choices:
+            if choice_label == unicode(self.value):
+                return choice_value
         return self.value
 

asadb/util/warehouse-refresh.sh

@@ -15 +15 @@
 echo
 echo Changes in this commit:
-git show
+git show --stat
 
 echo
@@ -30 +30 @@
 echo
 echo Changes in this commit:
-git show
+git show --stat
 
 echo