Changeset - 52fa696a01b2
[Not reviewed]
0 1 0
Christopher Neugebauer - 8 years ago 2016-09-15 05:33:52
chrisjrn@gmail.com
Fixes GroupMemberCondition test
1 file changed with 1 insertions and 3 deletions:
0 comments (0 inline, 0 general)
registrasion/controllers/conditions.py
Show inline comments
...
 
@@ -313,27 +313,25 @@ class SpeakerConditionController(IsMetByFilter, ConditionController):
 
        being a presenter or copresenter of a proposal. '''
 

	
 
        u = user
 
        # User is a presenter
 
        user_is_presenter = Q(
 
            is_presenter=True,
 
            proposal_kind__proposalbase__presentation__speaker__user=u,
 
        )
 
        # User is a copresenter
 
        user_is_copresenter = Q(
 
            is_copresenter=True,
 
            proposal_kind__proposalbase__presentation__additional_speakers__user=u,  # NOQA
 
        )
 

	
 
        return queryset.filter(user_is_presenter | user_is_copresenter)
 

	
 

	
 
class GroupMemberConditionController(IsMetByFilter, ConditionController):
 

	
 
    @classmethod
 
    def pre_filter(self, conditions, user):
 
        ''' Returns all of the items from conditions which are enabled by a
 
        user being member of a Django Auth Group. '''
 

	
 
        return conditions.filter(
 
            group=user.groups.all(),
 
        )
 
        return conditions.filter(group__in=user.groups.all())
0 comments (0 inline, 0 general)