Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
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
Romain Courteaud
erp5_rtl_support
Commits
fa0c0c85
Commit
fa0c0c85
authored
Dec 27, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] do not sync opml from stopped hosting subscription
parent
ee6bc18d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
11 deletions
+15
-11
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
+13
-9
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 @
fa0c0c85
...
...
@@ -297,7 +297,7 @@
}
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
query
:
'
(portal_type:"Hosting Subscription") AND (validation_state:"validated")
'
,
select_list
:
[
'
title
'
,
'
default_predecessor_uid
'
,
'
uid
'
],
select_list
:
[
'
title
'
,
'
default_predecessor_uid
'
,
'
uid
'
,
'
slap_state
'
],
limit
:
[
0
,
limit
],
sort_on
:
[
[
"
creation_date
"
,
"
descending
"
]
...
...
@@ -307,15 +307,19 @@
var
i
,
uid_search_list
=
[];
for
(
i
=
0
;
i
<
result
.
data
.
total_rows
;
i
+=
1
)
{
if
(
result
.
data
.
rows
[
i
].
value
.
slap_state
!==
"
destroy_requested
"
)
{
hosting_subscription_list
.
push
({
title
:
result
.
data
.
rows
[
i
].
value
.
title
,
relative_url
:
result
.
data
.
rows
[
i
].
id
relative_url
:
result
.
data
.
rows
[
i
].
id
,
active
:
(
result
.
data
.
rows
[
i
].
value
.
slap_state
===
"
start_requested
"
)
?
true
:
false
});
uid_search_list
.
push
(
result
.
data
.
rows
[
i
].
value
.
uid
);
if
(
result
.
data
.
rows
[
i
].
value
.
default_predecessor_uid
)
{
uid_dict
[
result
.
data
.
rows
[
i
].
value
.
default_predecessor_uid
]
=
i
;
}
}
}
return
gadget
.
state
.
erp5_gadget
.
allDocs
({
query
:
'
(portal_type:"Software Instance") AND
'
+
'
(predecessor_related_uid:("
'
+
uid_search_list
.
join
(
'
","
'
)
+
'
"))
'
,
...
...
@@ -344,7 +348,7 @@
password
:
tmp_parameter
.
password
,
basic_login
:
btoa
(
tmp_parameter
.
username
+
'
:
'
+
tmp_parameter
.
password
),
active
:
tru
e
active
:
hosting_subscription_list
[
uid_dict
[
tmp_uid
]].
activ
e
});
}
}
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml
View file @
fa0c0c85
...
...
@@ -250,7 +250,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.37770.32649.605
8
</string>
</value>
<value>
<string>
96
4.27271.46031.2310
8
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -268,7 +268,7 @@
</tuple>
<state>
<tuple>
<float>
151
1174176.26
</float>
<float>
151
4389684.37
</float>
<string>
UTC
</string>
</tuple>
</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