1
=== modified file 'src/postorius/auth/decorators.py'
2
--- src/postorius/auth/decorators.py	2015-02-09 14:35:44 +0000
3
+++ src/postorius/auth/decorators.py	2015-04-13 21:09:22 +0000
4
@@ -82,13 +82,18 @@
5
82
        if getattr(user, 'is_list_owner', None):
82
        if getattr(user, 'is_list_owner', None):
6
83
            return fn(*args, **kwargs)
83
            return fn(*args, **kwargs)
7
84
        if getattr(user, 'is_list_moderator', None):
84
        if getattr(user, 'is_list_moderator', None):
9
85
            return fn(*args, **kwargs)
85
	    return fn(*args, **kwargs)
10
86
        mlist = List.objects.get_or_404(fqdn_listname=list_id)
86
        mlist = List.objects.get_or_404(fqdn_listname=list_id)
11
87
        if user.email not in mlist.moderators and \
87
        if user.email not in mlist.moderators and \
12
88
                user.email not in mlist.owners:
88
                user.email not in mlist.owners:
13
89
            raise PermissionDenied
89
            raise PermissionDenied
16
90
        else:
90
	else:
17
91
            user.is_list_moderator = True
91
	    if user.email in mlist.moderators and \
18
92
		    user.email not in mlist.owners:
19
93
	        user.is_list_moderator = True
20
94
	    else:
21
95
	        user.is_list_moderator = True
22
96
	        user.is_list_owner = True
23
92
            return fn(*args, **kwargs)
97
            return fn(*args, **kwargs)
24
93
    return wrapper
98
    return wrapper
25
94
99
26
95
100
27
=== modified file 'src/postorius/templates/postorius/menu/list_nav.html'
28
--- src/postorius/templates/postorius/menu/list_nav.html	2015-04-13 19:38:03 +0000
29
+++ src/postorius/templates/postorius/menu/list_nav.html	2015-04-13 21:09:22 +0000
30
@@ -9,7 +9,7 @@
31
9
        {% if user.is_superuser or user.is_list_owner %}
9
        {% if user.is_superuser or user.is_list_owner %}
32
10
            <li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.list_id %}">{% trans "Members" %}</a></li>
10
            <li class="mm_nav_item"><a class="{% nav_active_class current 'list_members' %}" href="{% url 'list_members' list.list_id %}">{% trans "Members" %}</a></li>
33
11
        {% endif %}
11
        {% endif %}
35
12
        {% if user.is_superuser or user.is_list_moderator %}
12
        {% if user.is_superuser or user.is_list_owner or user.is_list_moderator %}
36
13
            <li class="mm_nav_item"><a class="{% nav_active_class current 'list_held_messages' %}" href="{% url 'list_held_messages' list.list_id %}">{% trans "Held Messages" %}</a></li>
13
            <li class="mm_nav_item"><a class="{% nav_active_class current 'list_held_messages' %}" href="{% url 'list_held_messages' list.list_id %}">{% trans "Held Messages" %}</a></li>
37
14
        {% endif %}
14
        {% endif %}
38
15
        {% if user.is_superuser or user.is_list_owner %}
15
        {% if user.is_superuser or user.is_list_owner %}
Reviewer	Review Type	Date Requested	Status
Terri		2015-04-13	Approve on 2015-04-14
Review via email: mp+256037@code.launchpad.net