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
Paul Graydon
slapos.core
Commits
bab1d5fc
Commit
bab1d5fc
authored
Sep 20, 2019
by
Thomas Gambier
🚴🏼
Committed by
Rafael Monnerat
Sep 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: fix computer view after clicking 'Save'
Add the corresponding test.
parent
af4e4819
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
9 deletions
+30
-9
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.js
...page_module/rjs_gadget_erp5_page_slap_computer_view_js.js
+1
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
...age_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
+2
-2
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
+4
-1
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
+2
-2
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
...teItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
+21
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.js
View file @
bab1d5fc
...
@@ -63,8 +63,7 @@
...
@@ -63,8 +63,7 @@
})
})
.
push
(
function
(
content
)
{
.
push
(
function
(
content
)
{
return
gadget
.
updateDocument
(
content
)
return
gadget
.
updateDocument
(
content
)
.
push
(
function
()
{
.
push
(
function
(
ndoc
)
{
var
ndoc
=
gadget
.
state
.
doc
;
ndoc
.
allocation_scope
=
content
.
allocation_scope
;
ndoc
.
allocation_scope
=
content
.
allocation_scope
;
return
gadget
.
render
({
return
gadget
.
render
({
jio_key
:
gadget
.
state
.
jio_key
,
jio_key
:
gadget
.
state
.
jio_key
,
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
View file @
bab1d5fc
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
4.62049.17150.785
</string>
</value>
<value>
<string>
97
8.36756.24043.65297
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -275,7 +275,7 @@
...
@@ -275,7 +275,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
58467914.2
8
</float>
<float>
15
68971483.4
8
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.js
View file @
bab1d5fc
...
@@ -33,7 +33,10 @@
...
@@ -33,7 +33,10 @@
doc
[
property
]
=
content
[
property
];
doc
[
property
]
=
content
[
property
];
}
}
}
}
return
gadget
.
jio_put
(
gadget
.
state
.
jio_key
,
doc
);
return
gadget
.
jio_put
(
gadget
.
state
.
jio_key
,
doc
)
.
push
(
function
()
{
return
doc
;
});
})
})
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
.
declareMethod
(
'
triggerSubmit
'
,
function
()
{
return
this
.
getDeclaredGadget
(
'
fg
'
)
return
this
.
getDeclaredGadget
(
'
fg
'
)
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.xml
View file @
bab1d5fc
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
6.9867.41515.40260
</string>
</value>
<value>
<string>
97
8.36745.20465.19319
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
1425760.83
</float>
<float>
156
8971515.61
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
View file @
bab1d5fc
...
@@ -415,11 +415,30 @@
...
@@ -415,11 +415,30 @@
<tr>
<tr>
<td>
select
</td>
<td>
select
</td>
<td>
//select[@id="allocation_scope"]
</td>
<td>
//select[@id="allocation_scope"]
</td>
<td>
Closed forever
</td>
<td>
Open for Friends only
</td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/save"
/>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/save"
/>
<tr>
<td>
waitForElementPresent
</td>
<td>
//textarea[@id="subject_list"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//textarea[@id="subject_list"]
</td>
<td>
demo@user.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/save"
/>
<tr>
<td>
assertValue
</td>
<td>
//textarea[@id="subject_list"]
</td>
<td>
demo@user.com
</td>
</tr>
<tal:block
define=
"menu_item python: 'Servers'; header menu_item"
>
<tal:block
define=
"menu_item python: 'Servers'; header menu_item"
>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/access_menu_item"
/>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/access_menu_item"
/>
</tal:block>
</tal:block>
...
@@ -430,7 +449,7 @@
...
@@ -430,7 +449,7 @@
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/access_menu_item"
/>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/access_menu_item"
/>
</tal:block>
</tal:block>
<tal:block
tal:define=
"pagination_configuration python: {'header': '(
0)', 'footer': 'No r
ecords'}"
>
<tal:block
tal:define=
"pagination_configuration python: {'header': '(
1)', 'footer': '1 R
ecords'}"
>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/check_listbox_pagination_text"
/>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/check_listbox_pagination_text"
/>
</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