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
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
463855b6
Commit
463855b6
authored
Oct 29, 2018
by
Jérome Perrin
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
officejs_support_request_ui: prefer RSVP.hash for readability
parent
00ab06d7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
38 deletions
+23
-38
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_panel_js.js
...ateItem/web_page_module/gadget_supportrequest_panel_js.js
+8
-13
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_panel_js.xml
...teItem/web_page_module/gadget_supportrequest_panel_js.xml
+2
-2
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js
...dule/gadget_supportrequest_pt_form_view_discussable_js.js
+12
-22
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml
...ule/gadget_supportrequest_pt_form_view_discussable_js.xml
+1
-1
No files found.
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_panel_js.js
View file @
463855b6
...
...
@@ -92,23 +92,18 @@
if
(
modification_dict
.
hasOwnProperty
(
"
global
"
))
{
queue
.
push
(
function
()
{
return
RSVP
.
all
([
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
supportrequest_preference
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
logout
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
search
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
jio_key
:
"
support_request_module
"
,
page
:
"
list
"
}})
]
);
return
RSVP
.
hash
({
preference_href
:
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
supportrequest_preference
"
}}),
logout_href
:
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
logout
"
}}),
search_href
:
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
search
"
}}),
supportrequest_href
:
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
jio_key
:
"
support_request_module
"
,
page
:
"
list
"
}})
}
);
})
.
push
(
function
(
result_list
)
{
.
push
(
function
(
panel_options
)
{
// XXX: Customize panel header!
return
context
.
translateHtml
(
panel_template_header
()
+
panel_template_body
({
"
preference_href
"
:
result_list
[
0
],
"
logout_href
"
:
result_list
[
1
],
"
search_href
"
:
result_list
[
2
],
"
supportrequest_href
"
:
result_list
[
3
]
})
panel_template_body
(
panel_options
)
);
})
.
push
(
function
(
my_translated_or_plain_html
)
{
...
...
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_panel_js.xml
View file @
463855b6
...
...
@@ -252,8 +252,8 @@
</tuple>
<state>
<tuple>
<float>
15
23022102.41
</float>
<string>
GMT+
2
</string>
<float>
15
40789939.84
</float>
<string>
GMT+
9
</string>
</tuple>
</state>
</object>
...
...
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js
View file @
463855b6
...
...
@@ -125,34 +125,24 @@
element
.
classList
.
remove
(
'
ui-disabled
'
);
});
})
// render the header
.
push
(
function
()
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
editable
:
true
}}),
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
action
"
}}),
gadget
.
getUrlFor
({
command
:
'
history_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_previous
'
}),
gadget
.
getUrlFor
({
command
:
'
selection_next
'
}),
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
tab
"
}}),
gadget
.
state
.
erp5_document
.
_links
.
action_object_report_jio
?
return
RSVP
.
hash
({
edit_url
:
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
editable
:
true
}}),
actions_url
:
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
action
"
}}),
selection_url
:
gadget
.
getUrlFor
({
command
:
'
history_previous
'
}),
previous_url
:
gadget
.
getUrlFor
({
command
:
'
selection_previous
'
}),
next_url
:
gadget
.
getUrlFor
({
command
:
'
selection_next
'
}),
tab_url
:
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
tab
"
}}),
export_url
:
gadget
.
state
.
erp5_document
.
_links
.
action_object_report_jio
?
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
"
export
"
}})
:
""
,
calculatePageTitle
(
gadget
,
gadget
.
state
.
erp5_document
)
]);
})
.
push
(
function
(
all_result
)
{
return
gadget
.
updateHeader
({
edit_url
:
all_result
[
0
],
actions_url
:
all_result
[
1
],
selection_url
:
all_result
[
2
],
previous_url
:
all_result
[
3
],
next_url
:
all_result
[
4
],
tab_url
:
all_result
[
5
],
export_url
:
all_result
[
6
],
page_title
:
all_result
[
7
]
page_title
:
calculatePageTitle
(
gadget
,
gadget
.
state
.
erp5_document
)
});
})
.
push
(
function
(
header_options
)
{
return
gadget
.
updateHeader
(
header_options
);
})
.
push
(
function
()
{
// set locale for momentjs
return
gadget
.
getSettingList
([
"
selected_language
"
,
...
...
bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml
View file @
463855b6
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
15
39946621.33
</float>
<float>
15
40790153.05
</float>
<string>
GMT+9
</string>
</tuple>
</state>
...
...
Jérome Perrin
@jerome
mentioned in commit
e22aa2c2
·
Oct 30, 2018
mentioned in commit
e22aa2c2
mentioned in commit e22aa2c29f0e21e4ae5f9e253ca328eafdc4ad81
Toggle commit list
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