Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5
Commits
2430e032
Commit
2430e032
authored
Sep 03, 2021
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_monitoring: handle predecessor category renaming to successor
See
nexedi/slapos.core!307 (
b7d5041e
)
parent
c9630e9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js
...web_page_module/gadget_erp5_page_ojsm_import_export_js.js
+5
-5
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml
...eb_page_module/gadget_erp5_page_ojsm_import_export_js.xml
+2
-2
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js
View file @
2430e032
...
@@ -335,7 +335,7 @@
...
@@ -335,7 +335,7 @@
}
}
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
query
:
'
(portal_type:"Instance Tree") AND (validation_state:"validated")
'
,
query
:
'
(portal_type:"Instance Tree") AND (validation_state:"validated")
'
,
select_list
:
[
'
title
'
,
'
default_
prede
cessor_uid
'
,
'
uid
'
,
'
slap_state
'
],
select_list
:
[
'
title
'
,
'
default_
suc
cessor_uid
'
,
'
uid
'
,
'
slap_state
'
],
limit
:
[
0
,
limit
],
limit
:
[
0
,
limit
],
sort_on
:
[
sort_on
:
[
[
"
creation_date
"
,
"
descending
"
]
[
"
creation_date
"
,
"
descending
"
]
...
@@ -355,15 +355,15 @@
...
@@ -355,15 +355,15 @@
"
start_requested
"
)
?
"
Started
"
:
"
Stopped
"
"
start_requested
"
)
?
"
Started
"
:
"
Stopped
"
});
});
uid_search_list
.
push
(
result
.
data
.
rows
[
i
].
value
.
uid
);
uid_search_list
.
push
(
result
.
data
.
rows
[
i
].
value
.
uid
);
if
(
result
.
data
.
rows
[
i
].
value
.
default_
prede
cessor_uid
)
{
if
(
result
.
data
.
rows
[
i
].
value
.
default_
suc
cessor_uid
)
{
uid_dict
[
result
.
data
.
rows
[
i
].
value
.
default_
prede
cessor_uid
]
=
i
;
uid_dict
[
result
.
data
.
rows
[
i
].
value
.
default_
suc
cessor_uid
]
=
i
;
}
}
}
}
}
}
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
query
:
'
(portal_type:"Software Instance") AND
'
+
query
:
'
(portal_type:"Software Instance") AND
'
+
'
(
prede
cessor_related_uid:("
'
+
uid_search_list
.
join
(
'
","
'
)
+
'
"))
'
,
'
(
suc
cessor_related_uid:("
'
+
uid_search_list
.
join
(
'
","
'
)
+
'
"))
'
,
select_list
:
[
'
uid
'
,
'
prede
cessor_related_uid
'
,
'
connection_xml
'
],
select_list
:
[
'
uid
'
,
'
suc
cessor_related_uid
'
,
'
connection_xml
'
],
limit
:
[
0
,
limit
]
limit
:
[
0
,
limit
]
});
});
})
})
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml
View file @
2430e032
...
@@ -258,7 +258,7 @@
...
@@ -258,7 +258,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
994.3534
2.36450.4698
4
</string>
</value>
<value>
<string>
994.3534
9.51657.916
4
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -276,7 +276,7 @@
...
@@ -276,7 +276,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1630678
427.22
</float>
<float>
1630678
740.59
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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