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
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
086c5f11
Commit
086c5f11
authored
Jun 01, 2018
by
Alain Takoudjou
Committed by
Rafael Monnerat
Sep 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_monitoring] load monitoring parameter from json serialized connection parameter
parent
a2bccd78
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
28 deletions
+56
-28
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
+51
-23
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
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml
...m/web_page_module/gadget_officejs_monitoring_appcache.xml
+3
-3
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.js
View file @
086c5f11
...
@@ -260,26 +260,55 @@
...
@@ -260,26 +260,55 @@
});
});
}
}
function
getParameterDictFromUrl
(
uri_param
)
{
if
(
uri_param
.
has
(
'
url
'
)
&&
uri_param
.
has
(
'
password
'
)
&&
uri_param
.
has
(
'
username
'
)
&&
uri_param
.
get
(
'
url
'
).
startsWith
(
'
http
'
))
{
return
{
opml_url
:
uri_param
.
get
(
'
url
'
),
username
:
uri_param
.
get
(
'
username
'
),
password
:
uri_param
.
get
(
'
password
'
)
};
}
}
function
getParameterFromconnectionDict
(
connection_dict
)
{
if
(
connection_dict
[
"
monitor-url
"
]
&&
connection_dict
[
"
monitor-url
"
].
startsWith
(
'
http
'
)
&&
connection_dict
[
"
monitor-user
"
]
&&
connection_dict
[
"
monitor-password
"
])
{
return
{
opml_url
:
connection_dict
[
"
monitor-url
"
],
username
:
connection_dict
[
"
monitor-user
"
],
password
:
connection_dict
[
"
monitor-password
"
]
};
}
}
function
readMonitoringParameter
(
parmeter_xml
)
{
function
readMonitoringParameter
(
parmeter_xml
)
{
var
parser
=
new
DOMParser
(),
var
parser
=
new
DOMParser
(),
xmlDoc
=
parser
.
parseFromString
(
parmeter_xml
,
"
text/xml
"
),
xmlDoc
=
parser
.
parseFromString
(
parmeter_xml
,
"
text/xml
"
),
parameter
,
parameter
,
uri_param
,
uri_param
,
json_parameter
,
parameter_dict
,
monitor_dict
=
{};
monitor_dict
=
{};
json_parameter
=
xmlDoc
.
getElementById
(
"
_
"
);
if
(
json_parameter
!==
undefined
&&
json_parameter
!==
null
)
{
parameter_dict
=
JSON
.
parse
(
json_parameter
.
textContent
);
if
(
parameter_dict
.
hasOwnProperty
(
"
monitor-setup-url
"
))
{
return
getParameterDictFromUrl
(
new
URLSearchParams
(
parameter_dict
[
"
monitor-setup-url
"
])
);
}
return
getParameterFromconnectionDict
(
parameter_dict
);
}
parameter
=
xmlDoc
.
getElementById
(
"
monitor-setup-url
"
);
parameter
=
xmlDoc
.
getElementById
(
"
monitor-setup-url
"
);
if
(
parameter
!==
undefined
&&
parameter
!==
null
)
{
if
(
parameter
!==
undefined
&&
parameter
!==
null
)
{
// monitor-setup-url exists
// monitor-setup-url exists
uri_param
=
new
URLSearchParams
(
parameter
.
textContent
);
uri_param
=
new
URLSearchParams
(
parameter
.
textContent
);
if
(
uri_param
.
has
(
'
url
'
)
&&
uri_param
.
has
(
'
password
'
)
&&
return
getParameterDictFromUrl
(
uri_param
);
uri_param
.
has
(
'
username
'
)
&&
uri_param
.
get
(
'
url
'
).
startsWith
(
'
http
'
))
{
return
{
opml_url
:
uri_param
.
get
(
'
url
'
),
username
:
uri_param
.
get
(
'
username
'
),
password
:
uri_param
.
get
(
'
password
'
)
};
}
}
}
else
{
parameter
=
xmlDoc
.
getElementById
(
"
monitor-url
"
);
parameter
=
xmlDoc
.
getElementById
(
"
monitor-url
"
);
if
(
parameter
!==
undefined
&&
parameter
!==
null
)
{
if
(
parameter
!==
undefined
&&
parameter
!==
null
)
{
monitor_dict
.
url
=
parameter
.
textContent
.
trim
();
monitor_dict
.
url
=
parameter
.
textContent
.
trim
();
...
@@ -296,7 +325,6 @@
...
@@ -296,7 +325,6 @@
return
monitor_dict
;
return
monitor_dict
;
}
}
}
}
}
function
getInstanceOPMLListFromMaster
(
gadget
,
limit
)
{
function
getInstanceOPMLListFromMaster
(
gadget
,
limit
)
{
var
hosting_subscription_list
=
[],
var
hosting_subscription_list
=
[],
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_import_export_js.xml
View file @
086c5f11
...
@@ -250,7 +250,7 @@
...
@@ -250,7 +250,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.42470.47064.30003
</string>
</value>
<value>
<string>
96
7.60726.55816.57890
</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>
15
19233144.55
</float>
<float>
15
27847350.32
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_appcache.xml
View file @
086c5f11
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<item>
<item>
<key>
<string>
text_content
</string>
</key>
<key>
<string>
text_content
</string>
</key>
<value>
<string>
CACHE MANIFEST\n
<value>
<string>
CACHE MANIFEST\n
# generated on Fri, 2
1 Fev 2018 10:37:42
+0000\n
# generated on Fri, 2
0 May 2018 17:47:45
+0000\n
# XXX + fonts\n
# XXX + fonts\n
# images/ajax-loader.gif\n
# images/ajax-loader.gif\n
CACHE:\n
CACHE:\n
...
@@ -387,7 +387,7 @@ NETWORK:\n
...
@@ -387,7 +387,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
5.42293.15886.4599
4
</string>
</value>
<value>
<string>
96
6.64659.26947.4500
4
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -405,7 +405,7 @@ NETWORK:\n
...
@@ -405,7 +405,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
19222522.75
</float>
<float>
15
27847381.11
</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