Skip to content

erp5
erp5
Commit 316c617c authored by Xiaowu Zhang's avatar Xiaowu Zhang
Browse files
Options

erp5_web_renderjs_ui: fix user can't log out bug

parent 8f9ca6c6
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 15 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
View file @ 316c617c
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</div>\n </div>\n
</li>\n </li>\n
{{/if}}\n {{/if}}\n
<li class="ui-last-child"><a class="ui-btn ui-btn-icon-left ui-icon-power-off" data-i18n="Logout">Logout</a></li>\n <li class="ui-last-child"><a href="{{logout_href}}" class="ui-btn ui-btn-icon-left ui-icon-power-off" data-i18n="Logout">Logout</a></li>\n
</ul>\n </ul>\n
</div>\n </div>\n
</script>\n </script>\n
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>sven</string> </value> <value> <string>xiaowu</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>942.11707.40779.32529</string> </value> <value> <string>942.20332.24952.65262</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -336,8 +336,8 @@ ...@@ -336,8 +336,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1428416647.44</float> <float>1429861586.7</float>
<string>GMT</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @ 316c617c
...@@ -164,7 +164,8 @@ ...@@ -164,7 +164,8 @@
return RSVP.all([\n return RSVP.all([\n
g.whoWantToDisplayThisFrontPage("front"),\n g.whoWantToDisplayThisFrontPage("front"),\n
g.whoWantToDisplayThisFrontPage("history"),\n g.whoWantToDisplayThisFrontPage("history"),\n
g.getLanguageList()\n g.getLanguageList(),\n
g.whoWantToDisplayThisFrontPage("login")\n
]);\n ]);\n
})\n })\n
.push(function (all_result) {\n .push(function (all_result) {\n
...@@ -189,7 +190,8 @@ ...@@ -189,7 +190,8 @@
tmp += panel_template_body({\n tmp += panel_template_body({\n
"module_href": all_result[0],\n "module_href": all_result[0],\n
"history_href": all_result[1],\n "history_href": all_result[1],\n
"language_list": language_list\n "language_list": language_list,\n
"logout_href": all_result[3]\n
});\n });\n
return tmp;\n return tmp;\n
})\n })\n
...@@ -373,7 +375,7 @@ ...@@ -373,7 +375,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>romain</string> </value> <value> <string>xiaowu</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -387,7 +389,7 @@ ...@@ -387,7 +389,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>942.34814.2083.30532</string> </value> <value> <string>942.35795.13990.52787</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -405,8 +407,8 @@ ...@@ -405,8 +407,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1432629724.1</float> <float>1429862098.61</float>
<string>GMT</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_loginform_js.xml
View file @ 316c617c
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
return g.getElement()\n return g.getElement()\n
.push(function (element) {\n .push(function (element) {\n
g.props.element = element;\n g.props.element = element;\n
document.cookie = "__ac=" + \'=;expires=Thu, 01 Jan 1970 00:00:01 GMT;\';\n
});\n });\n
})\n })\n
\n \n
...@@ -286,7 +287,7 @@ ...@@ -286,7 +287,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>xiaowu</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -300,7 +301,7 @@ ...@@ -300,7 +301,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>940.11553.26313.55261</string> </value> <value> <string>942.20332.24952.65262</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -318,8 +319,8 @@ ...@@ -318,8 +319,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1421080830.84</float> <float>1429862553.03</float>
<string>GMT</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7