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
Jérome Perrin
slapos.core
Commits
74ce8553
Commit
74ce8553
authored
May 12, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Improve and fixup fast input for shared instances
See merge request
nexedi/slapos.core!526
parents
7e60eec9
7bb57abd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_instance_tree_view_js.js
...module/rjs_gadget_erp5_page_slap_instance_tree_view_js.js
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_instance_tree_view_js.xml
...odule/rjs_gadget_erp5_page_slap_instance_tree_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_header_js.js
...mplateItem/web_page_module/rjs_gadget_slapos_header_js.js
+2
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_header_js.xml
...plateItem/web_page_module/rjs_gadget_slapos_header_js.xml
+2
-2
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceFastInputSlave.zpt
...ests/slaposjs_zuite/testSlapOSJSServiceFastInputSlave.zpt
+1
-1
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_instance_tree_view_js.js
View file @
74ce8553
...
@@ -496,7 +496,7 @@
...
@@ -496,7 +496,7 @@
page
:
"
slap_intent
"
,
page
:
"
slap_intent
"
,
intent
:
"
request
"
,
intent
:
"
request
"
,
shared
:
1
,
shared
:
1
,
sofware_type
:
gadget
.
state
.
doc
.
source_reference
,
sof
t
ware_type
:
gadget
.
state
.
doc
.
source_reference
,
software_release
:
gadget
.
state
.
doc
.
url_string
,
software_release
:
gadget
.
state
.
doc
.
url_string
,
sla_xml
:
gadget
.
state
.
doc
.
fast_input_dict
.
sla_xml
,
sla_xml
:
gadget
.
state
.
doc
.
fast_input_dict
.
sla_xml
,
strict
:
"
True
"
strict
:
"
True
"
...
@@ -531,7 +531,7 @@
...
@@ -531,7 +531,7 @@
header_dict
.
start_url
=
url_list
[
2
];
header_dict
.
start_url
=
url_list
[
2
];
}
}
if
(
gadget
.
state
.
doc
.
fast_input_dict
.
enabled
!==
undefined
)
{
if
(
gadget
.
state
.
doc
.
fast_input_dict
.
enabled
!==
undefined
)
{
header_dict
.
fast_input
_url
=
url_list
[
8
];
header_dict
.
add_shared
_url
=
url_list
[
8
];
}
}
if
(
!
gadget
.
state
.
editable
)
{
if
(
!
gadget
.
state
.
editable
)
{
header_dict
.
edit_content
=
url_list
[
0
];
header_dict
.
edit_content
=
url_list
[
0
];
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_instance_tree_view_js.xml
View file @
74ce8553
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
7.21760.63093.46916
</string>
</value>
<value>
<string>
100
8.19588.59182.15291
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -258,7 +258,7 @@
...
@@ -258,7 +258,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
79945002.44
</float>
<float>
16
83727059.58
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_header_js.js
View file @
74ce8553
...
@@ -57,7 +57,8 @@
...
@@ -57,7 +57,8 @@
[
'
accept_url
'
,
'
Accept
'
,
'
check-circle
'
],
[
'
accept_url
'
,
'
Accept
'
,
'
check-circle
'
],
[
'
reject_url
'
,
'
Reject
'
,
'
ban
'
],
[
'
reject_url
'
,
'
Reject
'
,
'
ban
'
],
[
'
contract_url
'
,
'
Contract
'
,
'
usd
'
],
[
'
contract_url
'
,
'
Contract
'
,
'
usd
'
],
[
'
list_all_url
'
,
'
Show all
'
,
'
eye
'
]
[
'
list_all_url
'
,
'
Show all
'
,
'
eye
'
],
[
'
add_shared_url
'
,
'
Add Shared
'
,
'
magic
'
]
],
],
header_button_template
=
function
(
data
)
{
header_button_template
=
function
(
data
)
{
// <form><button name='{{name}}' data-i18n="{{title}}" type='submit' class='ui-icon-{{icon}} ui-btn-icon-left {{class}}'>{{title}}</button></form>
// <form><button name='{{name}}' data-i18n="{{title}}" type='submit' class='ui-icon-{{icon}} ui-btn-icon-left {{class}}'>{{title}}</button></form>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_header_js.xml
View file @
74ce8553
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
984.49089.34672.33348
</string>
</value>
<value>
<string>
1006.58340.40727.23620
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -258,7 +258,7 @@
...
@@ -258,7 +258,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
599255121.3
6
</float>
<float>
1
683730643.5
6
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceFastInputSlave.zpt
View file @
74ce8553
...
@@ -226,7 +226,7 @@
...
@@ -226,7 +226,7 @@
<td>
www.erp5.com
</td>
<td>
www.erp5.com
</td>
</tr>
</tr>
<tal:block
define=
"menu_action python: '
Fast Input
'"
>
<tal:block
define=
"menu_action python: '
Add Shared
'"
>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_submenu_action"
/>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_submenu_action"
/>
</tal:block>
</tal:block>
...
...
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