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
0834711e
Commit
0834711e
authored
Oct 07, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Don't display action if user has no contract
... else it leads to nowhere.
parent
9d89f640
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
10 deletions
+17
-10
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
..._page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
+15
-8
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
...page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
View file @
0834711e
...
...
@@ -180,20 +180,27 @@
url_list
[
0
]
+
url_list
[
1
]
+
"
/Person_getCloudContractRelated?return_json=True
"
);
})
.
push
(
function
(
contract_relative_url
)
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
jio_key
"
:
contract_relative_url
,
var
promise_list
=
[
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}})
];
if
(
contract_relative_url
)
{
promise_list
.
push
(
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
jio_key
"
:
contract_relative_url
,
"
page
"
:
"
slap_controller
"
}})
]);
);
}
return
RSVP
.
all
(
promise_list
);
})
.
push
(
function
(
result
)
{
return
gadget
.
updateHeader
(
{
var
header_dict
=
{
page_title
:
invoices_translation
,
selection_url
:
result
[
0
],
contract_url
:
result
[
1
],
filter_action
:
true
});
};
if
(
result
[
1
])
{
header_dict
.
contract_url
=
result
[
1
];
}
return
gadget
.
updateHeader
(
header_dict
);
});
});
}(
window
,
rJS
,
RSVP
));
\ No newline at end of file
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
View file @
0834711e
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
986.
30539.17853.40038
</string>
</value>
<value>
<string>
986.
54956.15848.43639
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
1
599538229.52
</float>
<float>
1
602092381.9
</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