cubicweb: comparison web/views/basecontrollers.py

equal deleted inserted replaced

-:4f4369e63f5e
+:6abd6e3599f4
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses
 """
 __docformat__ = "restructuredtext en"
-from smtplib import SMTP
 import simplejson
 from logilab.common.decorators import cached
 from logilab.common.date import strptime
-from cubicweb import (NoSelectableObject, ValidationError, ObjectNotFound,
+from cubicweb import (NoSelectableObject, ObjectNotFound, ValidationError,
-typed_eid)
+AuthenticationError, typed_eid)
 from cubicweb.utils import CubicWebJsonEncoder
 from cubicweb.selectors import authenticated_user, match_form_params
 from cubicweb.mail import format_mail
-from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed, DirectResponse, json_dumps
+from cubicweb.web import Redirect, RemoteCallFailed, DirectResponse, json_dumps
 from cubicweb.web.controller import Controller
-from cubicweb.web.views import vid_from_rset
+from cubicweb.web.views import vid_from_rset, formrenderers
-from cubicweb.web.views.formrenderers import FormRenderer
 try:
 from cubicweb.web.facet import (FilterRQLBuilder, get_facet,
 prepare_facets_rqlst)
 HAS_SEARCH_RESTRICTION = True
 def check_pageid(func):
 """decorator which checks the given pageid is found in the
 user's session data
 """
 def wrapper(self, *args, **kwargs):
-data = self._cw.get_session_data(self._cw.pageid)
+data = self._cw.session.data.get(self._cw.pageid)
 if data is None:
 raise RemoteCallFailed(self._cw._('pageid-not-found'))
 return func(self, *args, **kwargs)
 return wrapper
 def publish(self, rset=None):
 """log in the instance"""
 if self._cw.vreg.config['auth-mode'] == 'http':
 # HTTP authentication
-raise ExplicitLogin()
+raise AuthenticationError()
 else:
 # Cookie authentication
 return self.appli.need_login_content(self._cw)
 def _select_view_and_rset(self, rset):
 req = self._cw
 if rset is None and not hasattr(req, '_rql_processed'):
 req._rql_processed = True
-rset = self.process_rql(req.form.get('rql'))
+if req.cnx is None:
+rset = None
+else:
+rset = self.process_rql(req.form.get('rql'))
 if rset and rset.rowcount == 1 and '__method' in req.form:
 entity = rset.get_entity(0, 0)
 try:
 method = getattr(entity, req.form.pop('__method'))
 method()
 def _validation_error(req, ex):
 req.cnx.rollback()
 # XXX necessary to remove existant validation error?
 # imo (syt), it's not necessary
-req.get_session_data(req.form.get('__errorurl'), pop=True)
+req.session.data.pop(req.form.get('__errorurl'), None)
 foreid = ex.entity
 eidmap = req.data.get('eidmap', {})
 for var, eid in eidmap.items():
 if foreid == eid:
 foreid = var
 entity.eid = varname
 entity['pkey'] = propkey
 form = self._cw.vreg['forms'].select('edition', self._cw, entity=entity)
 form.build_context()
 vfield = form.field_by_name('value')
-renderer = FormRenderer(self._cw)
+renderer = formrenderers.FormRenderer(self._cw)
 return vfield.render(form, renderer, tabindex=tabindex) \
 + renderer.render_help(form, vfield)
 @xhtmlize
 def js_component(self, compid, rql, registry='components', extraargs=None):
 return self._cw.external_resource(resource)
 @check_pageid
 @jsonize
 def js_user_callback(self, cbname):
-page_data = self._cw.get_session_data(self._cw.pageid, {})
+page_data = self._cw.session.data.get(self._cw.pageid, {})
 try:
 cb = page_data[cbname]
 except KeyError:
 return None
 return cb(self._cw)
 def js_unregister_user_callback(self, cbname):
 self._cw.unregister_callback(self._cw.pageid, cbname)
 def js_unload_page_data(self):
-self._cw.del_session_data(self._cw.pageid)
+self._cw.session.data.pop(self._cw.pageid, None)
 def js_cancel_edition(self, errorurl):
 """cancelling edition from javascript
 We need to clear associated req's data :
 # relations edition stuff ##################################################
 def _add_pending(self, eidfrom, rel, eidto, kind):
 key = 'pending_%s' % kind
-pendings = self._cw.get_session_data(key, set())
+pendings = self._cw.session.data.setdefault(key, set())
 pendings.add( (typed_eid(eidfrom), rel, typed_eid(eidto)) )
-self._cw.set_session_data(key, pendings)
 def _remove_pending(self, eidfrom, rel, eidto, kind):
 key = 'pending_%s' % kind
-pendings = self._cw.get_session_data(key)
+pendings = self._cw.session.data[key]
 pendings.remove( (typed_eid(eidfrom), rel, typed_eid(eidto)) )
-self._cw.set_session_data(key, pendings)
 def js_remove_pending_insert(self, (eidfrom, rel, eidto)):
 self._remove_pending(eidfrom, rel, eidto, 'insert')
 def js_add_pending_inserts(self, tripletlist):
 body = self._cw.form['mailbody']
 subject = self._cw.form['subject']
 for recipient in self.recipients():
 text = body % recipient.as_email_context()
 self.sendmail(recipient.get_email(), subject, text)
-# breadcrumbs = self._cw.get_session_data('breadcrumbs', None)
+#breadcrumbs = self._cw.session.data.get('breadcrumbs', None)
 url = self._cw.build_url(__message=self._cw._('emails successfully sent'))
 raise Redirect(url)
 class MailBugReportController(SendMailController):
 else:
 self.redirect()
 def redirect(self):
 req = self._cw
-breadcrumbs = req.get_session_data('breadcrumbs', None)
+breadcrumbs = req.session.data.get('breadcrumbs', None)
 if breadcrumbs is not None and len(breadcrumbs) > 1:
 url = req.rebuild_url(breadcrumbs[-2],
 __message=req._('transaction undoed'))
 else:
 url = req.build_url(__message=req._('transaction undoed'))

changeset 5223	6abd6e3599f4
parent 5201	2b4267157f85
child 5244	5467674ad101