py_tasks_melange: comparison app/soc/views/models/base.py

equal deleted inserted replaced

-:aa1e786a0b1d
+:b82852e6963e
 self._logic: the logic singleton for this entity
 """
 DEF_SUBMIT_MSG_PARAM_NAME = 's'
+DEF_SUBMIT_MSG_PROFILE_SAVED = 0
 DEF_CREATE_NEW_ENTITY_MSG = ugettext_lazy(
-' You can create a new %(model_type)s by visiting'
+' You can create a new %(entity_type_lower)s by visiting'
 ' <a href="%(create)s">Create '
-'a New %(Type)s</a> page.')
+'a New %(entity_type)s</a> page.')
 def __init__(self, params=None, rights=None):
 """
 Args:
 entity = None
 try:
 entity = self._logic.getIfFields(**kwargs)
 except soc.logic.out_of_band.ErrorResponse, error:
-template = _params['public_template']
+template = self._params['public_template']
-return simple.errorResponse(request, error, template, context)
+return simple.errorResponse(request, page, error, template, context)
 if not entity:
 #TODO: Change this into a proper redirect
 return http.HttpResponseRedirect('/')
-self._makePublic(entity)
 context['entity'] = entity
 context['entity_type'] = self._params['name']
 template = self._params['public_template']
 that combines a Django view with sidebar menu info
 kwargs: not used for create()
 """
 # Create page is an edit page with no key fields
-kwargs = {}
+kwargs = self._logic.getEmptyKeyFields()
 return self.edit(request, page=page, **kwargs)
 def edit(self, request, page=None, **kwargs):
 """Displays the public page for the entity specified by **kwargs
 entity = None
 try:
 entity = self._logic.getIfFields(**kwargs)
 except soc.logic.out_of_band.ErrorResponse, error:
-template = soc._params['public_template']
+template = self._params['public_template']
-error.message = error.message + self.DEF_CREATE_NEW_ENTITY_MSG % {
+error.message = error.message + View.DEF_CREATE_NEW_ENTITY_MSG % {
-'entity_type_lower' : self._params['name_lower'],
+'entity_type_lower' : self._params['name'].lower(),
-'entity_type_upper' : self._parmas['name_upper'],
+'entity_type' : self._params['name'],
-'create' : self._redirects['create']
+'create' : self._params['create_redirect']
 }
-return simple.errorResponse(request, error, template, context)
+return simple.errorResponse(request, page, error, template, context)
 if request.method == 'POST':
 return self.editPost(request, entity, context)
 else:
 return self.editGet(request, entity, context)
 def editPost(self, request, entity, context):
 """Same as edit, but on POST
 """
 if entity:
 form = self._params['edit_form'](request.POST)
 else:
 form = self._params['create_form'](request.POST)
 if not form.is_valid():
-return
+return self._constructResponse(request, entity, context, form)
 fields = self.collectCleanedFields(form)
 self._editPost(request, entity, fields)
 if not entity:
 return http.HttpResponseRedirect('/')
 params = self._params['edit_params']
-# TODO(SRabbelier): Construct a suffix
+suffix = self._logic.constructKeyNameSuffix(fields)
-suffix = None
 # redirect to (possibly new) location of the entity
 # (causes 'Profile saved' message to be displayed)
 return helper.responses.redirectToChangedSuffix(
-request, None, suffix,
+request, suffix, suffix,
 params=params)
 def editGet(self, request, entity, context):
 """Same as edit, but on GET
 """
 suffix = None
 # Remove the params from the request, this is relevant only if
 # someone bookmarked a POST page.
 is_self_referrer = helper.requests.isReferrerSelf(request, suffix=suffix)
-if request.GET.get(self.DEF_SUBMIT_MSG_PARAM_NAME):
+if request.GET.get(View.DEF_SUBMIT_MSG_PARAM_NAME):
 if (not entity) or (not is_self_referrer):
 return http.HttpResponseRedirect(request.path)
 if entity:
 # Note: no message will be displayed if parameter is not present
 context['notice'] = helper.requests.getSingleIndexedParamValue(
-request, self.DEF_SUBMIT_MSG_PARAM_NAME,
+request, View.DEF_SUBMIT_MSG_PARAM_NAME,
 values=self._params['save_message'])
 # populate form with the existing entity
 form = self._params['edit_form'](instance=entity)
+self._editGet(request, entity, form)
 else:
 form = self._params['create_form']()
+return self._constructResponse(request, entity, context, form)
+def list(self, request, page=None):
+"""Displays the list page for the entity type
+Args:
+request: the standard Django HTTP request object
+page: a soc.logic.site.page.Page object which is abstraction
+that combines a Django view with sidebar menu info
+"""
+try:
+self.checkAccess('list', request)
+except soc.views.out_of_band.AccessViolationResponse, alt_response:
+return alt_response.response()
+context = helper.responses.getUniversalContext(request)
+context['page'] = page
+offset, limit = helper.lists.cleanListParameters(
+offset=request.GET.get('offset'), limit=request.GET.get('limit'))
+# Fetch one more to see if there should be a 'next' link
+entities = self._logic.getForLimitAndOffset(limit + 1, offset=offset)
+context['pagination_form'] = helper.lists.makePaginationForm(request, limit)
+templates = self._params['lists_template']
+context = helper.lists.setList(request, context, entities,
+offset, limit, templates)
+context['entity_type'] = self._params['name']
+context['entity_type_plural'] = self._params['name_plural']
+template = self._params['list_template']
+return helper.responses.respond(request, template, context)
+def delete(self, request, page=None, **kwargs):
+"""Shows the delete page for the entity specified by kwargs
+Args:
+request: the standard Django HTTP request object
+page: a soc.logic.site.page.Page object which is abstraction
+that combines a Django view with sidebar menu info
+kwargs: The Key Fields for the specified entity
+"""
+try:
+self.checkAccess('delete', request)
+except soc.views.out_of_band.AccessViolationResponse, alt_response:
+return alt_response.response()
+# create default template context for use with any templates
+context = helper.responses.getUniversalContext(request)
+context['page'] = page
+entity = None
+try:
+entity = self._logic.getIfFields(**kwargs)
+except soc.logic.out_of_band.ErrorResponse, error:
+template = self._params['create_template']
+error.message = error.message + View.DEF_CREATE_NEW_ENTITY_MSG % {
+'entity_type_lower' : self._params['name'].lower(),
+'entity_type' : self._params['name'],
+'create' : self._params['create_redirect']
+}
+return simple.errorResponse(request, page, error, template, context)
+if not entity:
+#TODO: Create a proper error page for this
+return http.HttpResponseRedirect('/')
+if not self._logic.isDeletable(entity):
+# TODO: Update the notice area telling the user that they
+# can't delete the entity
+pass
+self._logic.delete(entity)
+redirect = self._params['delete_redirect']
+return http.HttpResponseRedirect(redirect)
+def _editPost(self, request, entity, fields):
+"""Performs any required processing on the entity to post its edit page
+Args:
+request: the django request object
+entity: the entity to post
+fields: the new field values
+"""
+raise NotImplementedError
+def _editGet(self, request, entity, form):
+"""Performs any required processing on the form to get its edit page
+Args:
+request: the django request object
+entity: the entity to get
+form: the django form that will be used for the page
+"""
+pass
+def checkUnspecified(self, access_type, request):
+"""Checks whether an unspecified access_type should be allowed
+Args:
+access_type: the access type (such as 'list' or 'edit') that was
+not present in the _rights dictionary when checking.
+"""
+pass
+def _constructResponse(self, request, entity, context, form):
+"""Updates the context and returns a response for the specified arguments
+Args:
+request: the django request object
+entity: the entity that is used
+context: the context to be used
+form: the form that will be used
+"""
 context['form'] = form
 context['entity'] = entity
 context['entity_type'] = self._params['name']
 context['entity_type_plural'] = self._params['name_plural']
 template = self._params['edit_template']
 return helper.responses.respond(request, template, context)
-def list(self, request, page=None):
-"""Displays the list page for the entity type
-Args:
-request: the standard Django HTTP request object
-page: a soc.logic.site.page.Page object which is abstraction
-that combines a Django view with sidebar menu info
-"""
-try:
-self.checkAccess('list', request)
-except soc.views.out_of_band.AccessViolationResponse, alt_response:
-return alt_response.response()
-context = helper.responses.getUniversalContext(request)
-context['page'] = page
-offset, limit = helper.lists.cleanListParameters(
-offset=request.GET.get('offset'), limit=request.GET.get('limit'))
-# Fetch one more to see if there should be a 'next' link
-entities = self._logic.getForLimitAndOffset(limit + 1, offset=offset)
-context['pagination_form'] = helper.lists.makePaginationForm(request, limit)
-templates = self._params['lists_template']
-context = helper.lists.setList(request, context, entities,
-offset, limit, templates)
-context['entity_type'] = self._params['name']
-context['entity_type_plural'] = self._params['name_plural']
-template = self._params['list_template']
-return helper.responses.respond(request, template, context)
-def delete(self, request, page=None, **kwargs):
-"""Shows the delete page for the entity specified by kwargs
-Args:
-request: the standard Django HTTP request object
-page: a soc.logic.site.page.Page object which is abstraction
-that combines a Django view with sidebar menu info
-kwargs: The Key Fields for the specified entity
-"""
-try:
-self.checkAccess('delete', request)
-except soc.views.out_of_band.AccessViolationResponse, alt_response:
-return alt_response.response()
-# create default template context for use with any templates
-context = helper.responses.getUniversalContext(request)
-context['page'] = page
-entity = None
-try:
-entity = models.sponsor.logic.getIfFields(**kwargs)
-except soc.logic.out_of_band.ErrorResponse, error:
-template = self._templates['create']
-error.message = error.message + self.DEF_CREATE_NEW_ENTITY_MSG % {
-'entity_type_lower' : self._name,
-'entity_type_upper' : self._Name,
-'create' : self._redirects['create']
-}
-return simple.errorResponse(request, error, template, context)
-if not entity:
-#TODO: Create a proper error page for this
-return http.HttpResponseRedirect('/')
-if not self._logic.isDeletable(entity):
-# TODO: Update the notice area telling the user that they
-# can't delete the entity
-pass
-self._logic.delete(entity)
-redirect = self._params['delete_redirect']
-return http.HttpResponseRedirect(redirect)
-def _editPost(self, request, entity, fields):
-"""Performs any required processing on the entity to post its edit page
-Args:
-request: The django request object
-entity: the entity to make public
-fields: The new field values
-"""
-raise NotImplementedError
-def checkUnspecified(self, access_type, request):
-"""Checks whether an unspecified access_type should be allowed
-Args:
-access_type: the access type (such as 'list' or 'edit') that was
-not present in the _rights dictionary when checking.
-"""
-pass
 def checkAccess(self, access_type, request):
 """Runs all the defined checks for the specified type
 Args:
 access_type: the type of request (such as 'list' or 'edit')

changeset 399	b82852e6963e
parent 389	9b873166d7d5
child 402	021e86368600