py_tasks_melange: comparison app/soc/views/helper/access.py

equal deleted inserted replaced

-:9c4221f7b747
+:0afbdd0905ef
 raise out_of_band.LoginRequest(message_fmt=login_message_fmt)
 @allowDeveloper
 @denySidebar
 def checkIsGroupActive(self, django_args, group_logic):
-"""Raises an alternate HTTP response if Group state is not active.
+"""Raises an alternate HTTP response if Group status is not active.
 Args:
 django_args: a dictionary with django's arguments
 Raises:
 AccessViolationResponse:
 * if no Group is found
-* if the Group state is not active
+* if the Group status is not active
 """
 fields = {'link_id': django_args['link_id']}
 if django_args.get('scope_path'):
 fields['scope_path'] = django_args['scope_path']
 group_entity = group_logic.logic.getFromFieldsOr404(**fields)
-if group_entity.state == 'active':
+if group_entity.status == 'active':
 return
 # TODO tell the user that this group is not active
 self.deny(django_args)
 def checkCanMakeRequestToGroup(self, django_args, group_logic):
 """Raises an alternate HTTP response if the specified group is not in an
-active state.
+active status.
-Note that state hasn't been implemented yet
+Note that status hasn't been implemented yet
 Args:
 group_logic: Logic module for the type of group which the request is for
 """
 group_logic.logic, django_args['scope_path'])
 if not group_entity:
 raise out_of_band.Error(DEF_GROUP_NOT_FOUND_MSG, status=404)
-if group_entity.state != 'active':
+if group_entity.status != 'active':
 # TODO tell the user that this group is not active
 self.deny(django_args)
 return
 def checkCanCreateFromRequest(self, django_args, role_name):
 """Raises an alternate HTTP response if the specified request does not exist
-or if it's state is not group_accepted. Also when the group this request
+or if it's status is not group_accepted. Also when the group this request
-is from is in an inactive or invalid state access will be denied.
+is from is in an inactive or invalid status access will be denied.
 """
 self.checkIsUser(django_args)
 user_entity = user_logic.getForCurrentAccount()
 'scope_path': django_args['scope_path'],
 'role': role_name}
 request_entity = request_logic.getFromFieldsOr404(**fields)
-if request_entity.state != 'group_accepted':
+if request_entity.status != 'group_accepted':
 # TODO tell the user that this request has not been accepted yet
 self.deny(django_args)
-if request_entity.scope.state in ['invalid', 'inactive']:
+if request_entity.scope.status in ['invalid', 'inactive']:
 # TODO tell the user that it is not possible to create this role anymore
 self.deny(django_args)
 return
 def checkCanProcessRequest(self, django_args, role_name):
 """Raises an alternate HTTP response if the specified request does not exist
-or if it's state is completed or denied. Also Raises an alternate HTTP response
+or if it's status is completed or denied. Also Raises an alternate HTTP response
 whenever the group in the request is not active.
 """
 fields = {'link_id': django_args['link_id'],
 'scope_path': django_args['scope_path'],
 'role': role_name}
 request_entity = request_logic.getFromFieldsOr404(**fields)
-if request_entity.state in ['completed', 'denied']:
+if request_entity.status in ['completed', 'denied']:
 # TODO tell the user that this request has been processed
 self.deny(django_args)
-if request_entity.scope.state != 'active':
+if request_entity.scope.status != 'active':
 # TODO tell the user that this group cannot process requests
 self.deny(django_args)
 return
 def checkIsMyGroupAcceptedRequest(self, django_args):
 """Raises an alternate HTTP response if the specified request does not exist
-or if it's state is not group_accepted.
+or if it's status is not group_accepted.
 """
 self.checkIsUser(django_args)
 user_entity = user_logic.getForCurrentAccount()
 if not request_entity:
 # TODO return 404
 self.deny(django_args)
-if request_entity.state != 'group_accepted':
+if request_entity.status != 'group_accepted':
 self.deny(django_args)
 return
 @allowDeveloper
 scope_path = django_args['scope_path']
 if 'link_id' in django_args:
 scope_path = django_args['link_id']
 fields = {'user': self.user,
-'state': 'active'}
+'status': 'active'}
 if scope_path:
 fields['scope_path'] = scope_path
 host = host_logic.getForFields(fields, unique=True)
 else:
 scope_path = django_args['link_id']
 fields = {'user': user,
 'scope_path': scope_path,
-'state': 'active'}
+'status': 'active'}
 host = host_logic.getForFields(fields, unique=True)
 if host:
 return
 else:
 scope_path = django_args['link_id']
 fields = {'user': user,
 'scope_path': scope_path,
-'state': 'active'}
+'status': 'active'}
 club_admin_entity = club_admin_logic.getForFields(fields, unique=True)
 if club_admin_entity:
 return
 user = user_logic.getForCurrentAccount()
 properties = {
 'applicant': user,
-'state': 'accepted'
+'status': 'accepted'
 }
 application = app_logic.logic.getForFields(properties, unique=True)
 if application:
 'scope_path': django_args['scope_path'],
 }
 role_entity = role_logic.logic.getFromFieldsOr404(**fields)
-if role_entity.state != 'active':
+if role_entity.status != 'active':
 # role is not active
 self.deny(django_args)
 @allowDeveloper
 'scope_path': django_args['scope_path'],
 }
 role_entity = role_logic.logic.getFromFieldsOr404(**fields)
-if role_entity.state != 'active':
+if role_entity.status != 'active':
 # cannot manage this entity
 self.deny(django_args)
 fields = {'link_id': self.user.link_id,
 'scope_path': django_args['scope_path'],
-'state' : 'active'
+'status' : 'active'
 }
 manage_entity = manage_role_logic.logic.getForFields(fields, unique=True)
 if not manage_entity:

changeset 1085	0afbdd0905ef
parent 1080	d533408811ba
child 1107	a878188e225c