diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index ade89b15933..c3d20a4a3fd 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -129,13 +129,11 @@ def local_redirect(path, query=None, keep_hash=False, forward_debug=True, code=3 return werkzeug.utils.redirect(url, code) def redirect_with_hash(url, code=303): - if request.httprequest.user_agent.browser in ('msie', 'safari'): - # Most IE and Safari versions decided not to preserve location.hash upon - # redirect. And even if IE10 pretends to support it, it still fails - # inexplicably in case of multiple redirects (and we do have some). - # See extensive test page at http://greenbytes.de/tech/tc/httpredirects/ - return "
" % url - return werkzeug.utils.redirect(url, code) + # Most IE and Safari versions decided not to preserve location.hash upon + # redirect. And even if IE10 pretends to support it, it still fails + # inexplicably in case of multiple redirects (and we do have some). + # See extensive test page at http://greenbytes.de/tech/tc/httpredirects/ + return "" % url def module_topological_sort(modules): """ Return a list of module names sorted so that their dependencies of the diff --git a/addons/web/doc/qweb.rst b/addons/web/doc/qweb.rst index 61668dcb9be..a8225a72fee 100644 --- a/addons/web/doc/qweb.rst +++ b/addons/web/doc/qweb.rst @@ -312,15 +312,6 @@ Output Evaluates, html-escapes and outputs ``content``. -.. _qweb-directive-escf: - -.. function:: t-escf=content - - :param Format content: - - Similar to :ref:`t-esc"+value+" | "; - - } - html+="|||
"+stats.td_content+" | "; - - if (this.render == "cell"){ - for (var j=0; j < scheduler._cols.length; j++) { - html+=""+scheduler.templates[this.name+"_cell_value"](evs[i][j])+" | ";
- }
- } else {
- //section 2
- html+="";
-
- // adding events
- html += events_html;
-
- //section 3
- html+="
| ";
- }
- html+="
" + opt('allDayText') + " | " + + "" +
+ " " +
+ " | " +
+ "" + + " |
---|
" + + ((!slotNormal || !minutes) ? formatDate(d, opt('axisFormat')) : ' ') + + " | " + + "" +
+ " | " +
+ "
---|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- - |
+
+
+
+
+
+ |
+ + + | +