py_tasks_melange: comparison app/soc/views/models/club

equal deleted inserted replaced

-:9c4221f7b747
+:0afbdd0905ef
 new_params['sidebar_grouping'] = 'Clubs'
 new_params['create_template'] = 'soc/models/twoline_edit.html'
 new_params['edit_template'] = 'soc/models/twoline_edit.html'
-new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'state',
+new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status',
 'created_on', 'last_modified_on']
 new_params['create_extra_dynafields'] = {
 'backup_admin_link_id': forms.CharField(
 label=soc.models.club_app.ClubApplication.backup_admin.verbose_name
 ),
 user_entity = user_logic.logic.getForCurrentAccount()
 is_developer = accounts.isDeveloper(user=user_entity)
 filter = {
-'state': 'needs review',
+'status': 'needs review',
 }
 if not is_developer:
 # only select the applications for this user so construct a filter
 filter['applicant'] = user_entity
 request, pa_params, filter, 0)
 # get all the reviewed applications now
 # re-use the old filter, but set to only reviewed and accepted
-filter['state'] = 'accepted'
+filter['status'] = 'accepted'
 aa_params = params.copy() # accepted applications
 if is_developer:
 aa_params['list_description'] = ugettext(
 request, aa_params, filter, 1)
 # get all the reviewed applications that were denied
 # re use the old filter, but this time only for denied apps
-filter['state'] = 'rejected'
+filter['status'] = 'rejected'
 da_params = params.copy() # denied applications
 if is_developer:
 da_params['list_description'] = ugettext(
 contents = [pa_list, aa_list, da_list]
 if is_developer:
 # re use the old filter, but this time only for ignored apps
-filter['state'] = 'ignored'
+filter['status'] = 'ignored'
 ia_params = params.copy() # ignored applications
 ia_params['list_description'] = ugettext(
 "An overview of all ignored club applications.")
 if not entity:
 fields['applicant'] = user_logic.logic.getForCurrentAccount()
 # the application has either been created or edited so
-# the state needs to be set accordingly
+# the status needs to be set accordingly
-fields['state'] = 'needs review'
+fields['status'] = 'needs review'
 def _public(self, request, entity, context):
 """See base._public().
 """
 error, request, template=params['error_public'], context=context)
 get_dict = request.GET
 # check to see if we can make a decision for this application
-if 'state' in get_dict.keys():
+if 'status' in get_dict.keys():
-state_value = get_dict['state']
+status_value = get_dict['status']
-if state_value in ['accepted', 'rejected', 'ignored']:
+if status_value in ['accepted', 'rejected', 'ignored']:
-# this application has been properly reviewed update the state
+# this application has been properly reviewed update the status
-fields = {'state' : state_value}
+fields = {'status' : status_value}
 self._logic.updateEntityProperties(entity, fields)
-if state_value == 'accepted':
+if status_value == 'accepted':
 # the application has been accepted send out a notification
 notifications.sendNewClubNotification(entity)
 return self.reviewOverview(request, access_type,
 page_name=page_name, params=params, **kwargs)
 @decorators.merge_params
 @decorators.check_access
 def reviewOverview(self, request, access_type,
 page_name=None, params=None, **kwargs):
-"""Displays multiple lists of applications that are in different
+"""Displays multiple lists of applications that are in a different
-states of the application process.
+status of the application process.
 """
 params = dicts.merge(params, self._params)
 # only select the requests that haven't been reviewed yet
-filter = {'state' : 'needs review'}
+filter = {'status' : 'needs review'}
 ur_params = params.copy()
 ur_params['list_description'] = ugettext('A list of all unhandled '
 'applications.')
 ur_params ['list_action'] = (redirects.getReviewRedirect, params)
 ur_list = helper.lists.getListContent(
 request, ur_params, filter, 0)
 # only select the requests that haven't been turned into a group yet
-filter['state'] = 'accepted'
+filter['status'] = 'accepted'
 uh_params = params.copy()
 uh_params['list_description'] = ugettext('A list of all applications '
 'that have been accepted but not turned into a Club yet')
 uh_params ['list_action'] = (redirects.getReviewRedirect, params)
 uh_list = helper.lists.getListContent(
 request, uh_params, filter, 1)
 # only select the requests the have been rejected
-filter ['state'] = 'rejected'
+filter ['status'] = 'rejected'
 den_params = params.copy()
 den_params['list_description'] = ugettext('A list of all applications '
 'that have been rejected')
 den_params ['list_action'] = (redirects.getReviewRedirect, params)
 den_list = helper.lists.getListContent(
 request, den_params, filter, 2)
 # only select the request that have been ignored
-filter ['state'] = 'ignored'
+filter ['status'] = 'ignored'
 ign_params = params.copy()
 ign_params['list_description'] = ugettext('A list of all applications '
 'that have been ignored')
 ign_params ['list_action'] = (redirects.getReviewRedirect, params)

changeset 1085	0afbdd0905ef
parent 1083	b8018d7a9f23
child 1115	0a723ff3d27c