Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5-Boxiang
Commits
316c617c
Commit
316c617c
authored
Apr 24, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: fix user can't log out bug
parent
8f9ca6c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
15 deletions
+18
-15
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
...mplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
+5
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
...TemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
+8
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_loginform_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_loginform_js.xml
+5
-4
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_html.xml
View file @
316c617c
...
...
@@ -167,7 +167,7 @@
</div>
\n
</li>
\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
</div>
\n
</script>
\n
...
...
@@ -304,7 +304,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
sven
</string>
</value>
<value>
<string>
xiaowu
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -318,7 +318,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
942.
11707.40779.32529
</string>
</value>
<value>
<string>
942.
20332.24952.65262
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -336,8 +336,8 @@
</tuple>
<state>
<tuple>
<float>
142
8416647.44
</float>
<string>
GMT
</string>
<float>
142
9861586.7
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @
316c617c
...
...
@@ -164,7 +164,8 @@
return RSVP.all([\n
g.whoWantToDisplayThisFrontPage("front"),\n
g.whoWantToDisplayThisFrontPage("history"),\n
g.getLanguageList()\n
g.getLanguageList(),\n
g.whoWantToDisplayThisFrontPage("login")\n
]);\n
})\n
.push(function (all_result) {\n
...
...
@@ -189,7 +190,8 @@
tmp
+=
panel_template_body({\n
"module_href":
all_result[0],\n
"history_href":
all_result[1],\n
"language_list":
language_list\n
"language_list":
language_list,\n
"logout_href":
all_result[3]\n
});\n
return
tmp;\n
})\n
...
...
@@ -373,7 +375,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
romain
</string>
</value>
<value>
<string>
xiaowu
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -387,7 +389,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
942.3
4814.2083.30532
</string>
</value>
<value>
<string>
942.3
5795.13990.52787
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -405,8 +407,8 @@
</tuple>
<state>
<tuple>
<float>
14
32629724.
1
</float>
<string>
GMT
</string>
<float>
14
29862098.6
1
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_loginform_js.xml
View file @
316c617c
...
...
@@ -118,6 +118,7 @@
return g.getElement()\n
.push(function (element) {\n
g.props.element = element;\n
document.cookie = "__ac=" + \'=;expires=Thu, 01 Jan 1970 00:00:01 GMT;\';\n
});\n
})\n
\n
...
...
@@ -286,7 +287,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
xiaowu
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -300,7 +301,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
94
0.11553.26313.55261
</string>
</value>
<value>
<string>
94
2.20332.24952.65262
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -318,8 +319,8 @@
</tuple>
<state>
<tuple>
<float>
142
1080830.84
</float>
<string>
GMT
</string>
<float>
142
9862553.03
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment