Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Léo-Paul Géneau
slapos.core
Commits
4a927725
Commit
4a927725
authored
Dec 27, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Wrapper getUrlForList instead getUrlFor
Reimplement the wrapper to follow up this change:
erp5@f9c408f7
parent
7c22321a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
30 deletions
+45
-30
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js.js
...e/rjs_gadget_erp5_page_slap_select_software_product_js.js
+19
-12
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js.xml
.../rjs_gadget_erp5_page_slap_select_software_product_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_release_js.js
...e/rjs_gadget_erp5_page_slap_select_software_release_js.js
+22
-14
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_release_js.xml
.../rjs_gadget_erp5_page_slap_select_software_release_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js.js
View file @
4a927725
...
...
@@ -9,22 +9,23 @@
.
declareAcquiredMethod
(
"
reload
"
,
"
reload
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
.
declareAcquiredMethod
(
"
setSetting
"
,
"
setSetting
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
allowPublicAcquisition
(
"
getUrlFor
"
,
function
(
param_list
)
{
var
gadget
=
this
;
if
((
param_list
[
0
].
command
===
"
index
"
)
&&
(
param_list
[
0
].
options
.
jio_key
)
&&
(
param_list
[
0
].
options
.
jio_key
.
startsWith
(
"
software_product_module
"
)))
{
param_list
[
0
].
options
.
page
=
"
slap_select_software_release
"
;
if
(
gadget
.
computer_jio_key
!==
undefined
)
{
param_list
[
0
].
options
.
computer_jio_key
=
gadget
.
computer_jio_key
;
.
allowPublicAcquisition
(
"
getUrlForList
"
,
function
(
promise_list
)
{
var
index
,
param_list
,
gadget
=
this
;
for
(
index
in
promise_list
[
0
])
{
if
((
promise_list
[
0
][
index
].
command
===
"
index
"
)
&&
(
promise_list
[
0
][
index
].
options
.
jio_key
)
&&
(
promise_list
[
0
][
index
].
options
.
jio_key
.
startsWith
(
"
software_product_module
"
)))
{
promise_list
[
0
][
index
].
options
.
page
=
"
slap_select_software_release
"
;
if
(
gadget
.
computer_jio_key
!==
undefined
)
{
promise_list
[
0
][
index
].
options
.
computer_jio_key
=
gadget
.
computer_jio_key
;
}
}
}
return
gadget
.
getUrlFor
(
param_list
[
0
])
.
push
(
function
(
result
)
{
return
result
;
});
return
gadget
.
getUrlForList
(
promise_list
[
0
]);
})
/////////////////////////////////////////////////////////////////
...
...
@@ -95,9 +96,15 @@
}
});
})
.
push
(
function
(
result
)
{
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
"
page
"
:
"
slap_controller
"
}})
]);
})
.
push
(
function
(
url_list
)
{
return
gadget
.
updateHeader
({
page_title
:
"
Select one Software
"
,
selection_url
:
url_list
[
0
],
filter_action
:
true
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js.xml
View file @
4a927725
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
64.7.40651.47240
</string>
</value>
<value>
<string>
9
72.37756.33633.30481
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
12753759.32
</float>
<float>
15
45870712.4
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_release_js.js
View file @
4a927725
...
...
@@ -10,24 +10,26 @@
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
.
declareAcquiredMethod
(
"
setSetting
"
,
"
setSetting
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
jio_get
"
,
"
jio_get
"
)
.
allowPublicAcquisition
(
"
getUrlFor
"
,
function
(
param_list
)
{
var
gadget
=
this
;
if
((
param_list
[
0
].
command
===
"
index
"
)
&&
(
param_list
[
0
].
options
.
jio_key
)
&&
(
param_list
[
0
].
options
.
jio_key
.
startsWith
(
"
software_release_module
"
)))
{
if
(
gadget
.
computer_jio_key
!==
undefined
)
{
param_list
[
0
].
options
.
page
=
"
slap_add_software_installation
"
;
param_list
[
0
].
options
.
computer_jio_key
=
gadget
.
computer_jio_key
;
}
else
{
param_list
[
0
].
options
.
page
=
"
slap_add_hosting_subscription
"
;
.
allowPublicAcquisition
(
"
getUrlForList
"
,
function
(
promise_list
)
{
var
index
,
param_list
,
gadget
=
this
;
for
(
index
in
promise_list
[
0
])
{
if
((
promise_list
[
0
][
index
].
command
===
"
index
"
)
&&
(
promise_list
[
0
][
index
].
options
.
jio_key
)
&&
(
promise_list
[
0
][
index
].
options
.
jio_key
.
startsWith
(
"
software_release_module
"
)))
{
if
(
gadget
.
computer_jio_key
!==
undefined
)
{
promise_list
[
0
][
index
].
options
.
page
=
"
slap_add_software_installation
"
;
promise_list
[
0
][
index
].
options
.
computer_jio_key
=
gadget
.
computer_jio_key
;
}
else
{
promise_list
[
0
][
index
].
options
.
page
=
"
slap_add_hosting_subscription
"
;
}
}
}
return
gadget
.
getUrlFor
(
param_list
[
0
])
.
push
(
function
(
result
)
{
return
result
;
});
return
gadget
.
getUrlForList
(
promise_list
[
0
]);
})
/////////////////////////////////////////////////////////////////
...
...
@@ -104,9 +106,15 @@
});
});
})
.
push
(
function
(
result
)
{
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
"
page
"
:
"
slap_select_software_product
"
}})
]);
})
.
push
(
function
(
url_list
)
{
return
gadget
.
updateHeader
({
page_title
:
"
Select one Release
"
,
selection_url
:
url_list
[
0
],
filter_action
:
true
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_select_software_release_js.xml
View file @
4a927725
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
63.7896.10186.1056
4
</string>
</value>
<value>
<string>
9
72.37768.39754.6205
4
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
12753841.61
</float>
<float>
15
45871468.02
</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