Revision c1007621 snf-astakos-app/astakos/im/tables.py

b/snf-astakos-app/astakos/im/tables.py
45 45
from astakos.im.models import *
46 46
from astakos.im.templatetags.filters import truncatename
47 47
from astakos.im.functions import (join_project_checks,
48
                                  leave_project_checks,
48
                                  can_leave_request,
49 49
                                  cancel_membership_checks)
50 50

  
51 51
DEFAULT_DATE_FORMAT = "d/m/Y"
......
197 197
            pass
198 198

  
199 199
        try:
200
            leave_project_checks(project)
201
            can_leave = True
200
            can_leave = can_leave_request(project, user)
202 201
        except PermissionDenied:
203 202
            pass
204 203

  
......
332 331
        urls = ['astakos.im.views.project_reject_member',
333 332
                'astakos.im.views.project_accept_member']
334 333
        actions = [_('Reject'), _('Accept')]
335
        prompts = [_('Are you sure you want to reject this member ?'),
336
                   _('Are you sure you want to accept this member ?')]
334
        prompts = [_('Are you sure you want to reject this member?'),
335
                   _('Are you sure you want to accept this member?')]
337 336
        confirms = [True, True]
338 337

  
339
    if membership.state == ProjectMembership.ACCEPTED:
338
    if membership.state in ProjectMembership.ACTUALLY_ACCEPTED:
340 339
        urls = ['astakos.im.views.project_remove_member']
341 340
        actions = [_('Remove')]
342
        if table.user == membership.person:
343
            actions = [_('Leave')]
344
        prompts = [_('Are you sure you want to remove this member ?')]
341
        prompts = [_('Are you sure you want to remove this member?')]
345 342
        confirms = [True, True]
346 343

  
347 344

  

Also available in: Unified diff