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
937ed31e
Commit
937ed31e
authored
Aug 20, 2022
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Minor bugs found on post production post upgrade
See merge request
nexedi/slapos.core!410
parents
60ec7cd8
cf326afc
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
17 deletions
+26
-17
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
...age_module/rjs_gadget_slapos_event_discussion_entry_js.js
+7
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
...ge_module/rjs_gadget_slapos_event_discussion_entry_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.js
...emplateItem/web_page_module/rjs_gadget_slapos_panel_js.js
+8
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.xml
...mplateItem/web_page_module/rjs_gadget_slapos_panel_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.js
...mplateItem/web_page_module/rjs_gadget_slapos_status_js.js
+3
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.xml
...plateItem/web_page_module/rjs_gadget_slapos_status_js.xml
+1
-1
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getStatusMonitorUrl.py
...l_skins/slapos_hal_json_style/Base_getStatusMonitorUrl.py
+2
-2
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/InstanceTree_isUpgradePossible.py
...portal_skins/slapos_pdm/InstanceTree_isUpgradePossible.py
+1
-1
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
View file @
937ed31e
...
...
@@ -11,12 +11,16 @@
})
.
onStateChange
(
function
()
{
var
gadget
=
this
,
header_text
=
"
By <strong>
"
+
gadget
.
state
.
author
+
"
</strong> on
"
+
gadget
.
state
.
modification_date
+
"
:
"
,
header_text_element
=
domsugar
(
'
p
'
,
[
'
By
'
,
domsugar
(
'
strong
'
,
{
text
:
gadget
.
state
.
author
}),
'
on
'
,
gadget
.
state
.
modification_date
,
'
:
'
]),
header
=
domsugar
(
"
div
"
,
{
class
:
"
slapos-event-discussion-message-header
"
},
[
domsugar
(
'
p
'
,
{
html
:
header_text
})
header_text_element
]);
if
(
gadget
.
state
.
content_type
===
'
text/html
'
)
{
return
domsugar
(
gadget
.
element
,
{},
[
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
View file @
937ed31e
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
1.26171.19762.42854
</string>
</value>
<value>
<string>
100
2.9606.37397.136
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
16
59986314.17
</float>
<float>
16
60875500.26
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.js
View file @
937ed31e
...
...
@@ -123,8 +123,15 @@
]));
}
domsugar
(
gadget
.
element
.
querySelector
(
"
ul
"
),
return
domsugar
(
gadget
.
element
.
querySelector
(
"
ul
"
),
[
domsugar
(
null
,
element_list
)]);
})
.
push
(
function
()
{
return
gadget
.
getDeclaredGadget
(
'
erp5_panel_shortcut
'
);
})
.
push
(
function
(
shortcut_gadget
)
{
// Ensure links are updated
return
shortcut_gadget
.
render
({
update
:
1
});
});
}
// Check for Alerts to pop
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.xml
View file @
937ed31e
...
...
@@ -255,7 +255,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
1.36662.17855.30088
</string>
</value>
<value>
<string>
100
2.19336.55332.19763
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -273,7 +273,7 @@
</tuple>
<state>
<tuple>
<float>
16
57677595.88
</float>
<float>
16
60570147.61
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.js
View file @
937ed31e
/*globals console, window, rJS, i18n, domsugar*/
/*jslint indent: 2, nomen: true, maxlen: 80*/
/*globals console, window, rJS, i18n, domsugar
*/
/*jslint indent: 2, nomen: true, maxlen: 80
*/
(
function
(
window
,
rJS
,
domsugar
)
{
"
use strict
"
;
...
...
@@ -230,9 +230,7 @@
right_class
=
status_class
;
}
else
{
if
(
result
&&
result
.
partition
)
{
right_class
=
getComputePartitionStatus
(
{
compute_partition_news
:
result
.
partition
}
);
right_class
=
getComputePartitionStatus
(
result
.
partition
);
}
}
}
else
if
(
result
&&
result
.
portal_type
&&
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_status_js.xml
View file @
937ed31e
...
...
@@ -292,7 +292,7 @@
</tuple>
<state>
<tuple>
<float>
16
58520198.62
</float>
<float>
16
60581838.54
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/Base_getStatusMonitorUrl.py
View file @
937ed31e
...
...
@@ -13,9 +13,9 @@ if context.getPortalType() == "Computer Network":
return
base_url
+
"aggregate_reference:(%s)"
%
compute_node_reference
if
context
.
getPortalType
()
==
"Instance Tree"
:
for
connection_parameter
in
context
.
InstanceTree_getConnectionParameterList
():
for
connection_parameter
in
context
.
InstanceTree_getConnectionParameterList
(
raw
=
True
):
if
connection_parameter
[
'connection_key'
]
==
"monitor-setup-url"
:
return
con
text
.
REQUEST
.
RESPONSE
.
redirect
(
connection_parameter
[
'connection_key'
])
return
con
nection_parameter
[
'connection_value'
]
base_url
=
'https://monitor.app.officejs.com/#/?page=ojsm_dispatch&query=portal_type:"Instance Tree" AND '
return
base_url
+
"title:(%s)"
%
context
.
getTitle
()
...
...
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/InstanceTree_isUpgradePossible.py
View file @
937ed31e
...
...
@@ -21,7 +21,7 @@ for instance in instance_list:
compute_node_list
.
append
(
partition
.
getParentValue
().
getUid
())
if
compute_node_list
is
None
:
if
not
compute_node_list
:
return
True
full_software_installation_list
=
[
si
for
si
in
...
...
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