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
Boxiang Sun
slapos.core
Commits
0cbc0062
Commit
0cbc0062
authored
May 16, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
slapos_erp5&jio: Update frontend default software release
See merge request
nexedi/slapos.core!530
parents
b27d537e
e3dc3d2c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
74 additions
and
27 deletions
+74
-27
master/bt5/slapos_erp5/PathTemplateItem/software_release_module/frontend.xml
...rp5/PathTemplateItem/software_release_module/frontend.xml
+50
-3
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/InstanceTree_getFastInputDict.py
...ns/slapos_hal_json_style/InstanceTree_getFastInputDict.py
+1
-1
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
...teItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
+3
-3
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceDuplicatedRequest.zpt
...s/slaposjs_zuite/testSlapOSJSServiceDuplicatedRequest.zpt
+8
-8
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByOrganisation.zpt
...laposjs_zuite/testSlapOSJSServiceSharedByOrganisation.zpt
+4
-4
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByProject.zpt
...sts/slaposjs_zuite/testSlapOSJSServiceSharedByProject.zpt
+4
-4
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSubscriptionAccessDenied.zpt
...s/slaposjs_zuite/testSlapOSJSSubscriptionAccessDenied.zpt
+4
-4
No files found.
master/bt5/slapos_erp5/PathTemplateItem/software_release_module/frontend.xml
View file @
0cbc0062
...
...
@@ -95,7 +95,7 @@
</tuple>
<state>
<tuple>
<float>
1
5209856
00.0
</float>
<float>
1
6837632
00.0
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
@@ -128,11 +128,11 @@
</item>
<item>
<key>
<string>
url_string
</string>
</key>
<value>
<string>
https://lab.nexedi.com/nexedi/slapos/raw/1.0.
149/software/caddy-frontend
/software.cfg
</string>
</value>
<value>
<string>
https://lab.nexedi.com/nexedi/slapos/raw/1.0.
319/software/rapid-cdn
/software.cfg
</string>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
1.0.
14
9
</string>
</value>
<value>
<string>
1.0.
31
9
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
...
...
@@ -978,6 +978,53 @@
</value>
</item>
</dictionary>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1006.58340.40727.23620
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<reference
id=
"4.1"
/>
</klass>
<tuple>
<reference
id=
"4.2"
/>
<reference
id=
"4.3"
/>
<none/>
</tuple>
<state>
<tuple>
<float>
1683921542.54
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/InstanceTree_getFastInputDict.py
View file @
0cbc0062
...
...
@@ -5,7 +5,7 @@
if
context
.
getRootSlave
():
return
{}
for
sr_string
in
[
'software/re6stnet/'
,
'software/
caddy-frontend
/'
]:
for
sr_string
in
[
'software/re6stnet/'
,
'software/
rapid-cdn
/'
]:
if
context
.
getSuccessorReference
()
is
not
None
and
sr_string
in
context
.
getUrlString
(
''
):
return
{
'enabled'
:
True
,
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
View file @
0cbc0062
...
...
@@ -270,18 +270,18 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//td/a[
contains(text(), "Frontend (1.0.149)")
]
</td>
<td>
//td/a[
text()='Frontend (1.0.319)'
]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//td/a[
contains(text(), "Frontend (1.0.149)")
]
</td>
<td>
//td/a[
text()='Frontend (1.0.319)'
]
</td>
<td></td>
</tr>
<tr>
<td>
click
</td>
<td>
//td/a[
contains(text(), "Frontend (1.0.149)")
]
</td>
<td>
//td/a[
text()='Frontend (1.0.319)'
]
</td>
<td></td>
</tr>
<tal:block
define=
"header python: 'Software Installation : Frontend'; "
>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceDuplicatedRequest.zpt
View file @
0cbc0062
...
...
@@ -106,19 +106,19 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
http://
www.erp5.com
</td>
<td>
//input[@name="//
domain
"]
</td>
<td>
www.erp5.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_proceed"
/>
...
...
@@ -229,19 +229,19 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
http://
www.erp5.com
</td>
<td>
//input[@name="//
domain
"]
</td>
<td>
www.erp5.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_proceed"
/>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByOrganisation.zpt
View file @
0cbc0062
...
...
@@ -168,19 +168,19 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
http://
www.erp5.com
</td>
<td>
//input[@name="//
domain
"]
</td>
<td>
www.erp5.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_proceed"
/>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByProject.zpt
View file @
0cbc0062
...
...
@@ -168,19 +168,19 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
http://
www.erp5.com
</td>
<td>
//input[@name="//
domain
"]
</td>
<td>
www.erp5.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_proceed"
/>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSubscriptionAccessDenied.zpt
View file @
0cbc0062
...
...
@@ -104,19 +104,19 @@
</tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
//input[@name="//
domain
"]
</td>
<td></td>
</tr>
<tr>
<td>
type
</td>
<td>
//input[@name="//
public-ipv4
"]
</td>
<td>
http://
www.erp5.com
</td>
<td>
//input[@name="//
domain
"]
</td>
<td>
www.erp5.com
</td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/click_proceed"
/>
...
...
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