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

equal deleted inserted replaced

-:3d40190f35b6
+:c3cdb581ffd2
 new_params['logic'] = club_app_logic.logic
 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',
+new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status',
-'reviewed', 'accepted', 'application_completed',
 '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 = {
-'application_completed': False,
+'status': 'needs review',
-'reviewed': False,
 }
 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['reviewed'] = True
+filter['status'] = 'accepted'
-filter['accepted'] = True
 aa_params = params.copy() # accepted applications
 if is_developer:
 aa_params['list_description'] = ugettext_lazy(
 aa_params['list_action'] = (redirects.getApplicantRedirect, aa_params)
 aa_list = list_helper.getListContent(
 request, aa_params, filter, 1)
-# Get all the reviewd applications that were denied
+# Get all the reviewed applications that were denied
 # Re use the old filter, but this time only for denied apps
-filter['accepted'] = False
+filter['status'] = 'rejected'
 da_params = params.copy() # denied applications
 if is_developer:
 da_params['list_description'] = ugettext_lazy(
 if not entity:
 fields['applicant'] = user_logic.logic.getForCurrentAccount()
 # the application has either been created or edited so
-# the review status needs to be set accordingly
+# the status needs to be set accordingly
-fields['reviewed'] = False
+fields['status'] = 'needs review'
-fields['accepted'] = False
 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 'accepted' in get_dict.keys():
+if 'status' in get_dict.keys():
-accepted_value = get_dict['accepted']
+status_value = get_dict['status']
-fields = {'reviewed' : False}
+if status_value in ['accepted', 'rejected', 'ignored']:
+# this application has been properly reviewed update the status
-if accepted_value == 'true':
+fields = {'status' : status_value}
-# the application has been accepted
-fields['accepted'] = True
-fields['reviewed'] = True
-notifications.sendNewClubNotification(entity)
-elif accepted_value == 'false':
-# the application has been denied
-fields['accepted'] = False
-fields['reviewed'] = True
-if fields['reviewed']:
-# the application has either been denied or accepted
-# mark it as reviewed and update accordingly
 application = self._logic.getFromFields(link_id=kwargs['link_id'])
 self._logic.updateModelProperties(application, fields)
 return self.reviewOverview(request, access_type,
 page_name=page_name, params=params, **kwargs)
 """
 params = dicts.merge(params, self._params)
 # only select the requests that haven't been reviewed yet
-filter = {'reviewed' : False}
+filter = {'status' : 'needs review'}
 ur_params = params.copy()
 ur_params['list_description'] = ugettext_lazy('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 = {'accepted' : True,
+filter['status'] = 'accepted'
-'application_completed' : False}
 uh_params = params.copy()
 uh_params['list_description'] = ugettext_lazy('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, 0)
 #only select the requests the have been denied
-filter = {'reviewed' : True,
+filter ['status'] = 'rejected'
-'accepted' : False}
 den_params = params.copy()
 den_params['list_description'] = ugettext_lazy('A list of all applications '
 'that have been denied')
 den_params ['list_action'] = (redirects.getReviewRedirect, params)

changeset 892	c3cdb581ffd2
parent 890	b3bf833c4580
child 893	2dba566e4bf8