Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Titouan Soulard
slapos.core
Commits
9362a190
Commit
9362a190
authored
Jul 02, 2020
by
Lu Xu
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: revert slapos controller page back to use portal_type
parent
68ec649c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
164 additions
and
166 deletions
+164
-166
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.js
...eb_page_module/rjs_gadget_erp5_page_slap_controller_js.js
+1
-12
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.xml
...b_page_module/rjs_gadget_erp5_page_slap_controller_js.xml
+163
-154
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.js
View file @
9362a190
...
@@ -69,20 +69,9 @@
...
@@ -69,20 +69,9 @@
}
else
if
((
result
.
portal_type
===
"
Organisation
"
)
&&
}
else
if
((
result
.
portal_type
===
"
Organisation
"
)
&&
result
.
role
===
"
host
"
)
{
result
.
role
===
"
host
"
)
{
child_gadget_url
=
"
gadget_erp5_page_slap_site_view.html
"
;
child_gadget_url
=
"
gadget_erp5_page_slap_site_view.html
"
;
}
else
if
((
result
.
portal_type
===
"
组织
"
)
&&
result
.
role
===
"
host
"
)
{
child_gadget_url
=
"
gadget_erp5_page_slap_site_view.html
"
;
}
else
if
(
result
.
portal_type
===
"
ERP5 Login
"
)
{
child_gadget_url
=
'
gadget_erp5_page_slap_
'
+
result
.
portal_type
.
replace
(
/ /g
,
'
_
'
).
toLowerCase
()
+
'
_view.html
'
;
}
else
if
(
result
.
portal_type
===
"
access_denied
"
)
{
child_gadget_url
=
'
gadget_erp5_page_slap_
'
+
result
.
portal_type
.
replace
(
/ /g
,
'
_
'
).
toLowerCase
()
+
'
_view.html
'
;
}
else
if
(
result
.
portal_type
!==
undefined
)
{
}
else
if
(
result
.
portal_type
!==
undefined
)
{
child_gadget_url
=
'
gadget_erp5_page_slap_
'
+
child_gadget_url
=
'
gadget_erp5_page_slap_
'
+
result
.
p
arent_relative_url
.
replace
(
/_module/g
,
'
'
).
toLowerCase
()
+
result
.
p
ortal_type
.
replace
(
/ /g
,
'
_
'
).
toLowerCase
()
+
'
_view.html
'
;
'
_view.html
'
;
}
else
{
}
else
{
throw
new
Error
(
'
Can not display document:
'
+
options
.
jio_key
);
throw
new
Error
(
'
Can not display document:
'
+
options
.
jio_key
);
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.xml
View file @
9362a190
...
@@ -150,11 +150,13 @@
...
@@ -150,11 +150,13 @@
</record>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -198,17 +200,20 @@
...
@@ -198,17 +200,20 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</value>
</tuple>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -231,7 +236,7 @@
...
@@ -231,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
983.16079.39534.2440
</string>
</value>
<value>
<string>
984.46206.41215.7833
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -249,7 +254,7 @@
...
@@ -249,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1587053604.03
</float>
<float>
1593694959.39
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
@@ -258,17 +263,20 @@
...
@@ -258,17 +263,20 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</value>
</tuple>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
patches.WorkflowTool
"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.
Workflow
"
/>
</pickle>
</pickle>
<pickle>
<pickle>
<tuple>
<dictionary>
<none/>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<list>
<dictionary>
<dictionary>
<item>
<item>
...
@@ -316,8 +324,9 @@
...
@@ -316,8 +324,9 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</value>
</tuple>
</item>
</dictionary>
</pickle>
</pickle>
</record>
</record>
</ZopeData>
</ZopeData>
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