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
Lu Xu
slapos.core
Commits
a79cbf73
Commit
a79cbf73
authored
6 years ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Improve Ticket view to render html messages and remove sort.
parent
052bf759
No related merge requests found
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
48 additions
and
26 deletions
+48
-26
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.js
...s_gadget_erp5_page_slap_regularisation_request_view_js.js
+5
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.xml
..._gadget_erp5_page_slap_regularisation_request_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
...b_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
+5
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.xml
..._page_module/rjs_gadget_erp5_page_slap_ticket_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.js
...ule/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.js
+5
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.xml
...le/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.html
...module/rjs_gadget_slapos_event_discussion_entry_html.html
+9
-0
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.xml
..._module/rjs_gadget_slapos_event_discussion_entry_html.xml
+3
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
...age_module/rjs_gadget_slapos_event_discussion_entry_js.js
+12
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
...ge_module/rjs_gadget_slapos_event_discussion_entry_js.xml
+3
-3
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.js
View file @
a79cbf73
...
...
@@ -27,7 +27,8 @@
// This code can cause problems if it is used more them once per
// page
param_list
[
0
].
sort_on
=
[[
"
modification_date
"
,
"
ascending
"
]];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
,
"
content_type
"
];
return
gadget
.
jio_allDocs
(
param_list
[
0
])
.
push
(
function
(
result
)
{
var
i
,
len
=
result
.
data
.
total_rows
;
...
...
@@ -40,6 +41,7 @@
"
default
"
:
{
doc
:
{
title
:
result
.
data
.
rows
[
i
].
value
.
title
,
source
:
result
.
data
.
rows
[
i
].
value
.
source_title
,
modification_date
:
result
.
data
.
rows
[
i
].
value
.
modification_date
,
content_type
:
result
.
data
.
rows
[
i
].
value
.
content_type
,
text_content
:
result
.
data
.
rows
[
i
].
value
.
text_content
}},
key
:
"
status
"
,
url
:
"
gadget_slapos_event_discussion_entry.html
"
,
...
...
@@ -180,8 +182,8 @@
"
(%22Web Message%22, %22Mail Message%22)
"
+
"
AND default_follow_up_reference%3A
"
+
gadget
.
state
.
doc
.
reference
,
"
portal_type
"
:
[],
"
search_column_list
"
:
column_list
,
"
sort_column_list
"
:
column_list
,
"
search_column_list
"
:
[]
,
"
sort_column_list
"
:
[]
,
"
sort
"
:
[[
"
text_content
"
,
"
ascending
"
]],
"
title
"
:
""
,
"
type
"
:
"
ListBox
"
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_regularisation_request_view_js.xml
View file @
a79cbf73
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.42
348.2972.5652
4
</string>
</value>
<value>
<string>
965.42
459.5459.416
4
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15192
25721.69
</float>
<float>
15192
32359.93
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.js
View file @
a79cbf73
...
...
@@ -27,7 +27,8 @@
// This code can cause problems if it is used more them once per
// page
param_list
[
0
].
sort_on
=
[[
"
modification_date
"
,
"
ascending
"
]];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
,
"
content_type
"
];
return
gadget
.
jio_allDocs
(
param_list
[
0
])
.
push
(
function
(
result
)
{
var
i
,
len
=
result
.
data
.
total_rows
;
...
...
@@ -40,6 +41,7 @@
"
default
"
:
{
doc
:
{
title
:
result
.
data
.
rows
[
i
].
value
.
title
,
source
:
result
.
data
.
rows
[
i
].
value
.
source_title
,
modification_date
:
result
.
data
.
rows
[
i
].
value
.
modification_date
,
content_type
:
result
.
data
.
rows
[
i
].
value
.
content_type
,
text_content
:
result
.
data
.
rows
[
i
].
value
.
text_content
}},
key
:
"
status
"
,
url
:
"
gadget_slapos_event_discussion_entry.html
"
,
...
...
@@ -180,8 +182,8 @@
"
(%22Web Message%22, %22Mail Message%22)
"
+
"
AND default_follow_up_reference%3A
"
+
gadget
.
state
.
doc
.
reference
,
"
portal_type
"
:
[],
"
search_column_list
"
:
column_list
,
"
sort_column_list
"
:
column_list
,
"
search_column_list
"
:
[]
,
"
sort_column_list
"
:
[]
,
"
sort
"
:
[[
"
text_content
"
,
"
ascending
"
]],
"
title
"
:
""
,
"
type
"
:
"
ListBox
"
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_view_js.xml
View file @
a79cbf73
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
4.47.21452.47701
</string>
</value>
<value>
<string>
96
5.42336.49617.6348
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15192
25005.36
</float>
<float>
15192
32298.79
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.js
View file @
a79cbf73
...
...
@@ -27,7 +27,8 @@
// This code can cause problems if it is used more them once per
// page
param_list
[
0
].
sort_on
=
[[
"
modification_date
"
,
"
ascending
"
]];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
];
param_list
[
0
].
select_list
=
[
"
uid
"
,
"
title
"
,
"
text_content
"
,
"
source_title
"
,
"
modification_date
"
,
"
content_type
"
];
return
gadget
.
jio_allDocs
(
param_list
[
0
])
.
push
(
function
(
result
)
{
var
i
,
len
=
result
.
data
.
total_rows
;
...
...
@@ -40,6 +41,7 @@
"
default
"
:
{
doc
:
{
title
:
result
.
data
.
rows
[
i
].
value
.
title
,
source
:
result
.
data
.
rows
[
i
].
value
.
source_title
,
modification_date
:
result
.
data
.
rows
[
i
].
value
.
modification_date
,
content_type
:
result
.
data
.
rows
[
i
].
value
.
content_type
,
text_content
:
result
.
data
.
rows
[
i
].
value
.
text_content
}},
key
:
"
status
"
,
url
:
"
gadget_slapos_event_discussion_entry.html
"
,
...
...
@@ -180,8 +182,8 @@
"
(%22Web Message%22, %22Mail Message%22)
"
+
"
AND default_follow_up_reference%3A
"
+
gadget
.
state
.
doc
.
reference
,
"
portal_type
"
:
[],
"
search_column_list
"
:
column_list
,
"
sort_column_list
"
:
column_list
,
"
search_column_list
"
:
[]
,
"
sort_column_list
"
:
[]
,
"
sort
"
:
[[
"
text_content
"
,
"
ascending
"
]],
"
title
"
:
""
,
"
type
"
:
"
ListBox
"
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_upgrade_decision_view_js.xml
View file @
a79cbf73
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
4.46.37492.55040
</string>
</value>
<value>
<string>
96
5.42382.57800.29883
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15192
25712.21
</float>
<float>
15192
32459.97
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.html
View file @
a79cbf73
...
...
@@ -23,6 +23,15 @@
<
/div
>
</script>
<script
id=
"inline-html-event-template"
type=
"text/x-handlebars-template"
>
<
div
class
=
"
slapos-event-discussion-message-header
"
>
<
p
>
By
<
strong
>
{{
author
}}
<
/strong> on {{modification_date}}: </
p
>
<
/div
>
<
div
class
=
"
slapos-event-discussion-message-body
"
><
/div
>
</script>
</head>
<body>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_html.xml
View file @
a79cbf73
...
...
@@ -220,7 +220,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zop
e
</string>
</value>
<value>
<string>
ERP5TypeTestCas
e
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.3592.4882.12629
</string>
</value>
<value>
<string>
96
5.42375.23341.30156
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
15
09124641.18
</float>
<float>
15
19232226.72
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.js
View file @
a79cbf73
...
...
@@ -7,7 +7,11 @@
inline_event_source
=
gadget_klass
.
__template_element
.
getElementById
(
"
inline-event-template
"
)
.
innerHTML
,
inline_status_template
=
Handlebars
.
compile
(
inline_event_source
);
inline_status_template
=
Handlebars
.
compile
(
inline_event_source
),
inline_html_event_source
=
gadget_klass
.
__template_element
.
getElementById
(
"
inline-html-event-template
"
)
.
innerHTML
,
inline_html_status_template
=
Handlebars
.
compile
(
inline_event_source
);
gadget_klass
...
...
@@ -18,15 +22,18 @@
})
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
,
template
=
inline_status_template
,
source
=
options
.
value
.
doc
.
source
,
modification_date
=
options
.
value
.
doc
.
modification_date
,
text_content
=
options
.
value
.
doc
.
text_content
,
title
=
options
.
value
.
doc
.
title
,
queue
=
new
RSVP
.
Queue
();
console
.
log
(
options
);
return
queue
content_type
=
options
.
value
.
doc
.
content_type
;
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
gadget
.
element
.
innerHTML
=
inline_status_template
({
if
(
content_type
===
'
text/html
'
)
{
template
=
inline_html_status_template
;
}
gadget
.
element
.
innerHTML
=
template
({
title
:
title
,
author
:
source
,
modification_date
:
modification_date
,
...
...
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_event_discussion_entry_js.xml
View file @
a79cbf73
...
...
@@ -216,7 +216,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zop
e
</string>
</value>
<value>
<string>
ERP5TypeTestCas
e
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
963.
3632.57367.46882
</string>
</value>
<value>
<string>
963.
7958.61571.55040
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
09126940.0
</float>
<float>
15
19227607.46
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
This diff is collapsed.
Click to expand it.
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