From ebfd2218f4a1878551474debff6d89aca182840e Mon Sep 17 00:00:00 2001 From: Lennard de Rijk Date: Wed, 29 Apr 2009 22:24:14 +0200 Subject: [PATCH] Fixed StudentProposal apply view that broke during split of Create/Edit view. Also included whitespace fixes. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed --- app/soc/views/models/student_proposal.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/soc/views/models/student_proposal.py b/app/soc/views/models/student_proposal.py index 2ee63c67..9b2dada9 100644 --- a/app/soc/views/models/student_proposal.py +++ b/app/soc/views/models/student_proposal.py @@ -485,18 +485,13 @@ class View(base.View): org_entity = org_logic.logic.getForFields(filter, unique=True) if org_entity: - # organization found use special form + # organization found use special form and also seed this form params['create_form'] = params['student_create_form'] + kwargs['organization'] = org_entity.link_id kwargs['content'] = org_entity.contrib_template - # Create page is an edit page with no key fields - empty_kwargs = {} - fields = self._logic.getKeyFieldNames() - for field in fields: - empty_kwargs[field] = None - - return super(View, self).edit(request, access_type, page_name=page_name, - params=params, seed=kwargs, **empty_kwargs) + return super(View, self).create(request, access_type, page_name=page_name, + params=params, **kwargs) @decorators.merge_params @decorators.check_access @@ -518,7 +513,7 @@ class View(base.View): proposal_logic = params['logic'] student_proposal_entity = proposal_logic.getForFields(filter, unique=True) reviewer = student_proposal_entity.scope - + # update the entity mark it as invalid proposal_logic.updateEntityProperties(student_proposal_entity, {'status': 'invalid'}) @@ -526,7 +521,7 @@ class View(base.View): # redirect to the program's homepage redirect_url = redirects.getHomeRedirect(student_proposal_entity.program, {'url_name': 'program'}) - + comment = "Student withdrew proposal." self._createReviewFor(student_proposal_entity, reviewer, comment) return http.HttpResponseRedirect(redirect_url) -- 2.11.4.GIT