equal
deleted
inserted
replaced
517 |
517 |
518 user_account = user_logic.logic.getForCurrentAccount() |
518 user_account = user_logic.logic.getForCurrentAccount() |
519 |
519 |
520 filter = { |
520 filter = { |
521 'user': user_account, |
521 'user': user_account, |
522 'scope': fields['scope'], |
|
523 'status': 'active' |
522 'status': 'active' |
524 } |
523 } |
|
524 if not entity: |
|
525 filter['scope'] = fields['scope'] |
|
526 else: |
|
527 filter['scope'] = entity.program |
525 |
528 |
526 role_entity = ghop_org_admin_logic.logic.getForFields( |
529 role_entity = ghop_org_admin_logic.logic.getForFields( |
527 filter, unique=True) |
530 filter, unique=True) |
528 |
531 |
529 if role_entity: |
532 if role_entity: |