cubicweb: comparison web/request.py

equal deleted inserted replaced

-:6397a9051f65
+:134613d3b353
 self.datadir_url = vreg.config.https_datadir_url
 else:
 self.uiprops = vreg.config.uiprops
 self.datadir_url = vreg.config.datadir_url
 # raw html headers that can be added from any view
-self.html_headers = HTMLHead()
+self.html_headers = HTMLHead(self.datadir_url)
 # form parameters
 self.setup_params(form)
 # dictionnary that may be used to store request data that has to be
 # shared among various components used to publish the request (views,
 # controller, application...)
 if param in self.no_script_form_params and val:
 val = self.no_script_form_param(param, val)
 if param == '_cwmsgid':
 self.set_message_id(val)
 elif param == '__message':
+warn('[3.13] __message in request parameter is deprecated (may '
+'only be given to .build_url). Seeing this message usualy '
+'means your application hold some <form> where you should '
+'replace use of __message hidden input by form.set_message, '
+'so new _cwmsgid mechanism is properly used',
+DeprecationWarning)
 self.set_message(val)
 else:
 self.form[param] = val
 def no_script_form_param(self, param, value):
 def reset_headers(self):
 """used by AutomaticWebTest to clear html headers between tests on
 the same resultset
 """
-self.html_headers = HTMLHead()
+self.html_headers = HTMLHead(self.datadir_url)
 return self
 # web state helpers #######################################################
 @property
 def message(self):
 try:
-return self.session.data.pop(self._msgid, '')
+return self.session.data.pop(self._msgid, u'')
 except AttributeError:
 try:
 return self._msg
 except AttributeError:
 return None
 @cached
 def redirect_message_id(self):
 return make_uid()
 def set_redirect_message(self, msg):
+# TODO - this should probably be merged with append_to_redirect_message
 assert isinstance(msg, unicode)
 msgid = self.redirect_message_id()
 self.session.data[msgid] = msg
 return msgid
 def append_to_redirect_message(self, msg):
 msgid = self.redirect_message_id()
 currentmsg = self.session.data.get(msgid)
 if currentmsg is not None:
-currentmsg = '%s %s' % (currentmsg, msg)
+currentmsg = u'%s %s' % (currentmsg, msg)
 else:
 currentmsg = msg
 self.session.data[msgid] = currentmsg
 return msgid
 # web edition helpers #####################################################
 @cached # so it's writed only once
 def fckeditor_config(self):
-self.add_js('fckeditor/fckeditor.js')
+fckeditor_url = self.build_url('fckeditor/fckeditor.js')
+self.add_js(fckeditor_url, localfile=False)
 self.html_headers.define_var('fcklang', self.lang)
 self.html_headers.define_var('fckconfigpath',
 self.data_url('cubicweb.fckcwconfig.js'))
 def use_fckeditor(self):
 return self.vreg.config.fckeditor_installed() and self.property_value('ui.fckeditor')
 form = self.form
 for param in form:
 try:
 name, peid = param.split(':', 1)
 except ValueError:
-if not param.startswith('__') and param != "eid":
+if not param.startswith('__') and param not in ('eid', '_cw_fields'):
 self.warning('param %s mis-formatted', param)
 continue
 if peid == eid:
 value = form[param]
 if value == INTERNAL_FIELD_VALUE:
 # quote or other special characters that will break the js expression.
 extraparams.setdefault('fname', 'view')
 url = self.build_url('json', **extraparams)
 cbname = build_cb_uid(url[:50])
 # think to propagate pageid. XXX see https://www.cubicweb.org/ticket/1753121
-jscode = 'function %s() { $("#%s").%s; }' % (
+jscode = u'function %s() { $("#%s").%s; }' % (
 cbname, nodeid, js.loadxhtml(url, {'pageid': self.pageid},
 'get', replacemode))
 self.html_headers.add_post_inline_script(jscode)
 return "javascript: %s()" % cbname
 # urls/path management ####################################################
+def build_url(self, *args, **kwargs):
+"""return an absolute URL using params dictionary key/values as URL
+parameters. Values are automatically URL quoted, and the
+publishing method to use may be specified or will be guessed.
+"""
+if '__message' in kwargs:
+msg = kwargs.pop('__message')
+kwargs['_cwmsgid'] = self.set_redirect_message(msg)
+return super(CubicWebRequestBase, self).build_url(*args, **kwargs)
 def url(self, includeparams=True):
 """return currently accessed url"""
 return self.base_url() + self.relative_path(includeparams)
 return 1./score, value
 def _parse_accept_header(raw_header, value_parser=None, value_sort_key=None):
 """returns an ordered list accepted types
-returned value is a list of 2-tuple (value, score), ordered
+:param value_parser: a function to parse a raw accept chunk. If None
-by score. Exact type of `value` will depend on what `value_parser`
+is provided, the function defaults to identity. If a function is provided,
-will reutrn. if `value_parser` is None, then the raw value, as found
+it must accept 2 parameters ``value`` and ``other_params``. ``value`` is
-in the http header, is used.
+the value found before the first ';', `other_params` is a dictionary
+built from all other chunks after this first ';'
+:param value_sort_key: a key function to sort values found in the accept
+header. This function will be passed a 3-tuple
+(raw_value, parsed_value, score). If None is provided, the default
+sort_key is 1./score
+:return: a list of 3-tuple (raw_value, parsed_value, score),
+ordered by score. ``parsed_value`` will be the return value of
+``value_parser(raw_value)``
 """
 if value_sort_key is None:
 value_sort_key = lambda infos: 1./infos[-1]
 values = []
 for info in raw_header.split(','):
 (type, subtype, type_params) corresponding to the mimetype definition
 e.g. : for 'text/*', `mimetypeinfo` will be ('text', '*', {}), for
 'text/html;level=1', `mimetypeinfo` will be ('text', '*', {'level': '1'})
 """
 try:
-media_type, media_subtype = value.strip().split('/')
+media_type, media_subtype = value.strip().split('/', 1)
 except ValueError: # safety belt : '/' should always be present
 media_type = value.strip()
 media_subtype = '*'
 return (media_type, media_subtype, other_params)

branch	stable
changeset 7677	134613d3b353
parent 7660	a1506b5306cc
child 7762	a3f9ba4d44eb
child 7793	8a330017ca4d