Fixed a bug where a GMAP error message would be displayed when the form was not valid.
The wrong params were used, so the wrong template was used to display the form. This also caused the instruction_text to dissapear.
Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed
#!/usr/bin/python2.5
#
# Copyright 2008 the Melange authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Views for Club App profiles.
"""
__authors__ = [
'"Sverre Rabbelier" <sverre@rabbelier.nl>',
'"Lennard de Rijk" <ljvderijk@gmail.com>',
]
from django import forms
from soc.logic import cleaning
from soc.logic import dicts
from soc.logic import models as model_logic
from soc.logic.models import host as host_logic
from soc.logic.models import club_app as club_app_logic
from soc.views.helper import access
from soc.views.models import group_app
import soc.logic.dicts
class View(group_app.View):
"""View methods for the Club Application model.
"""
def __init__(self, params=None):
"""Defines the fields and methods required for the base View class
to provide the user with list, public, create, edit and delete views.
Params:
params: a dict with params for this View
"""
rights = access.Checker(params)
rights['create'] = ['checkIsUser']
rights['delete'] = [('checkIsMyEntity',
[club_app_logic.logic, 'applicant', True])]
rights['edit'] = [('checkIsMyEntity',
[club_app_logic.logic, 'applicant', True])]
rights['list'] = ['checkIsUser']
rights['public'] = [('checkIsMyEntity',
[club_app_logic.logic, 'applicant', True])]
rights['review'] = [('checkHasRole', host_logic.logic)]
new_params = {}
new_params['rights'] = rights
new_params['logic'] = club_app_logic.logic
new_params['sidebar_grouping'] = 'Clubs'
new_params['create_extra_dynafields'] = {
'clean_link_id': cleaning.clean_new_club_link_id('link_id',
model_logic.club, club_app_logic)
}
new_params['name'] = "Club Application"
new_params['name_plural'] = "Club Applications"
new_params['name_short'] = "Club App"
new_params['url_name'] = "club_app"
new_params['group_url_name'] = 'club'
new_params['review_template'] = 'soc/club_app/review.html'
params = dicts.merge(params, new_params)
super(View, self).__init__(params=params)
view = View()
create = view.create
delete = view.delete
edit = view.edit
list = view.list
public = view.public
export = view.export
review = view.review
review_overview = view.reviewOverview