Changeset 7415a15 for asadb/groups/views.py

Timestamp:

Mar 31, 2012, 4:15:52 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

e49def5

Parents:

747c960

git-author:

Alex Dehnert <adehnert@…> (03/31/12 16:15:52)

git-committer:

Alex Dehnert <adehnert@…> (03/31/12 16:15:52)

Message:

Implement GroupFilter? default values better

This solves a problem where if you subclass GroupFilter? and add a required
field, the form will always be seen as bound, and consequently it will
give a validation error on initial load. We now use a "more right"
way to implement default values.

Also, as a convenience, if you pass in an empty data dictionary, we interpret
it as though it were none, so your form will not be bound if you use the
idiom of passing in request.GET regardless of whether your form has actually
been submitted.

File:

• asadb/groups/views.py (modified) (1 diff)

asadb/groups/views.py

@@ -564 +564 @@
 
     def __init__(self, data=None, *args, **kwargs):
-        if data is None: data = {}
-        else: data = data.copy()
+        if not data: data = None
+        super(GroupFilter, self).__init__(data, *args, **kwargs)
         active_pk = groups.models.GroupStatus.objects.get(slug='active').pk
-        data.setdefault('group_status', active_pk, )
-        super(GroupFilter, self).__init__(data, *args, **kwargs)
+        self.form.initial['group_status'] = active_pk