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
Joshua
erp5
Commits
12e69781
Commit
12e69781
authored
Oct 30, 2018
by
Alain Takoudjou
Committed by
Alain Takoudjou
Oct 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Hosting Subscription portal_type for dispatch too
parent
6f7596ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js
...Item/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js
+3
-12
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml
...tem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml
+2
-2
No files found.
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.js
View file @
12e69781
...
@@ -37,12 +37,8 @@
...
@@ -37,12 +37,8 @@
if
(
result
.
data
.
total_rows
===
1
)
{
if
(
result
.
data
.
total_rows
===
1
)
{
// one item found, redirect to it
// one item found, redirect to it
redirect_options
=
{
redirect_options
=
{
"
jio_key
"
:
result
.
data
.
rows
[
0
].
id
jio_key
:
result
.
data
.
rows
[
0
].
id
};
};
if
(
result
.
data
.
rows
[
0
].
value
.
portal_type
===
"
opml
"
)
{
redirect_options
.
page
=
"
ojsm_hosting_subscription_view
"
;
redirect_options
.
opml_key
=
result
.
data
.
rows
[
0
].
id
;
}
return
gadget
.
redirect
({
"
command
"
:
"
index
"
,
options
:
redirect_options
});
return
gadget
.
redirect
({
"
command
"
:
"
index
"
,
options
:
redirect_options
});
}
}
redirect_options
=
{
redirect_options
=
{
...
@@ -52,7 +48,7 @@
...
@@ -52,7 +48,7 @@
// take the first one
// take the first one
gadget
.
state
.
portal_type
=
result
.
data
.
rows
[
0
].
value
.
portal_type
;
gadget
.
state
.
portal_type
=
result
.
data
.
rows
[
0
].
value
.
portal_type
;
}
}
if
(
gadget
.
state
.
portal_type
===
"
opml
"
)
{
if
(
gadget
.
state
.
portal_type
===
"
Hosting Subscription
"
)
{
redirect_options
.
page
=
"
ojsm_hosting_subscription_list
"
;
redirect_options
.
page
=
"
ojsm_hosting_subscription_list
"
;
}
else
if
(
gadget
.
state
.
portal_type
===
"
Software Instance
"
)
{
}
else
if
(
gadget
.
state
.
portal_type
===
"
Software Instance
"
)
{
redirect_options
.
page
=
"
ojsm_software_instance_list
"
;
redirect_options
.
page
=
"
ojsm_software_instance_list
"
;
...
@@ -113,12 +109,7 @@
...
@@ -113,12 +109,7 @@
pt_result
=
regex
.
exec
(
options
.
query
);
pt_result
=
regex
.
exec
(
options
.
query
);
if
(
pt_result
!==
null
)
{
if
(
pt_result
!==
null
)
{
page_title
=
"
Searching
"
+
pt_result
[
1
]
+
"
(s)
"
;
page_title
=
"
Searching
"
+
pt_result
[
1
]
+
"
(s)
"
;
if
(
pt_result
[
1
]
===
"
Hosting Subscription
"
)
{
portal_type
=
pt_result
[
1
];
portal_type
=
"
opml
"
;
options
.
query
=
options
.
query
.
replace
(
pt_result
[
1
],
'
opml
'
);
}
else
{
portal_type
=
pt_result
[
1
];
}
}
}
return
gadget
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
'
ojsm_status_list
'
}})
return
gadget
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
'
ojsm_status_list
'
}})
...
...
bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_erp5_page_ojsm_dispatch_js.xml
View file @
12e69781
...
@@ -238,7 +238,7 @@
...
@@ -238,7 +238,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.3806
3.22401.199
6
</string>
</value>
<value>
<string>
963.3806
6.29413.6157
6
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
11190866.88
</float>
<float>
15
40892674.51
</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