app/soc/views/models/organization.py
changeset 2177 e2c193e1f631
parent 2155 8e26887b6d15
child 2195 a71c31527582
equal deleted inserted replaced
2176:3e5187b444db 2177:e2c193e1f631
   169 
   169 
   170     applicant_create_form = dynaform.extendDynaForm(
   170     applicant_create_form = dynaform.extendDynaForm(
   171         dynaform = self._params['create_form'],
   171         dynaform = self._params['create_form'],
   172         dynaproperties = updated_fields)
   172         dynaproperties = updated_fields)
   173 
   173 
   174     params['applicant_create_form'] = applicant_create_form
   174     self._params['applicant_create_form'] = applicant_create_form
   175 
   175 
   176   @decorators.merge_params
   176   @decorators.merge_params
   177   @decorators.check_access
   177   @decorators.check_access
   178   def applyMentor(self, request, access_type,
   178   def applyMentor(self, request, access_type,
   179                   page_name=None, params=None, **kwargs):
   179                   page_name=None, params=None, **kwargs):
   365       rights.checkIsHost()
   365       rights.checkIsHost()
   366       is_host = True
   366       is_host = True
   367     except out_of_band.Error:
   367     except out_of_band.Error:
   368       is_host = False
   368       is_host = False
   369 
   369 
   370     new_params = {}
   370     params = params.copy()
   371 
   371 
   372     if is_host:
   372     if is_host:
   373       new_params['list_action'] = (redirects.getAdminRedirect, params)
   373       params['list_action'] = (redirects.getAdminRedirect, params)
   374     else:
   374     else:
   375       new_params['list_action'] = (redirects.getPublicRedirect, params)
   375       params['list_action'] = (redirects.getPublicRedirect, params)
   376     # safe to merge them the wrong way around because of @merge_params
       
   377     params = dicts.merge(new_params, params)
       
   378 
   376 
   379     new_filter = {}
   377     new_filter = {}
   380 
   378 
   381     new_filter['scope_path'] = kwargs['scope_path']
   379     new_filter['scope_path'] = kwargs['scope_path']
   382     new_filter['status'] = 'active'
   380     new_filter['status'] = 'active'