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
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
Lukas Niegsch
erp5
Commits
a2bccd78
Commit
a2bccd78
authored
Apr 20, 2018
by
Alain Takoudjou
Committed by
Rafael Monnerat
Sep 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] show desactivated instance in monitor opml list
parent
4164fc66
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
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
-3
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 @
a2bccd78
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
function
getMonitorSetting
(
gadget
)
{
function
getMonitorSetting
(
gadget
)
{
return
gadget
.
jio_allDocs
({
return
gadget
.
jio_allDocs
({
select_list
:
[
"
basic_login
"
,
"
url
"
,
"
title
"
,
"
active
"
],
select_list
:
[
"
basic_login
"
,
"
url
"
,
"
title
"
,
"
active
"
,
"
state
"
],
query
:
'
(portal_type:"opml")
'
query
:
'
(portal_type:"opml")
'
})
})
.
push
(
function
(
opml_result
)
{
.
push
(
function
(
opml_result
)
{
...
@@ -61,6 +61,11 @@
...
@@ -61,6 +61,11 @@
"
description
"
:
"
OPML active state
"
,
"
description
"
:
"
OPML active state
"
,
"
type
"
:
"
boolean
"
,
"
type
"
:
"
boolean
"
,
"
default
"
:
true
"
default
"
:
true
},
"
state
"
:
{
"
description
"
:
"
OPML requested state
"
,
"
type
"
:
"
string
"
,
"
default
"
:
"
Started
"
}
}
},
},
"
additionalProperties
"
:
false
"
additionalProperties
"
:
false
...
@@ -188,8 +193,11 @@
...
@@ -188,8 +193,11 @@
item
=
{
item
=
{
title
:
configuration_dict
.
opml_description
[
i
].
title
,
title
:
configuration_dict
.
opml_description
[
i
].
title
,
url
:
configuration_dict
.
opml_description
[
i
].
href
,
url
:
configuration_dict
.
opml_description
[
i
].
href
,
active
:
true
,
active
:
configuration_dict
.
opml_description
[
i
].
active
,
portal_type
:
"
opml
"
portal_type
:
"
opml
"
,
has_monitor
:
configuration_dict
.
opml_description
[
i
]
.
href
.
startsWith
(
"
https://
"
),
state
:
configuration_dict
.
opml_description
[
i
].
state
||
"
Started
"
};
};
for
(
j
=
0
;
j
<
configuration_dict
.
monitor_url
.
length
;
j
+=
1
)
{
for
(
j
=
0
;
j
<
configuration_dict
.
monitor_url
.
length
;
j
+=
1
)
{
if
(
configuration_dict
.
monitor_url
[
j
].
parent_url
===
if
(
configuration_dict
.
monitor_url
[
j
].
parent_url
===
...
@@ -216,6 +224,8 @@
...
@@ -216,6 +224,8 @@
cred_list
=
atob
(
item
.
basic_login
).
split
(
'
:
'
);
cred_list
=
atob
(
item
.
basic_login
).
split
(
'
:
'
);
item
.
username
=
cred_list
[
0
];
item
.
username
=
cred_list
[
0
];
item
.
password
=
cred_list
[
1
];
item
.
password
=
cred_list
[
1
];
item
.
has_monitor
=
item
.
url
.
startsWith
(
"
https://
"
);
item
.
state
=
item
.
state
||
"
Started
"
;
pushSetting
(
item
.
url
,
item
);
pushSetting
(
item
.
url
,
item
);
}
}
}
}
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml
View file @
a2bccd78
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.42
096.47763.27016
</string>
</value>
<value>
<string>
965.42
470.47064.30003
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -268,7 +268,7 @@
...
@@ -268,7 +268,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15192
10888.89
</float>
<float>
15192
33144.55
</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