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
149
Merge Requests
149
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
a7359e8e
Commit
a7359e8e
authored
Nov 04, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_project_ui: get last test result state using jio
parent
377eef39
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
33 deletions
+36
-33
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getRenderJSExtraInfoParameterList.py
..._web_project/Project_getRenderJSExtraInfoParameterList.py
+8
-2
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js
...m/portal_skins/erp5_web_project/gadget_project_info.js.js
+28
-31
No files found.
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_getRenderJSExtraInfoParameterList.py
View file @
a7359e8e
...
...
@@ -14,11 +14,17 @@ portal_catalog = portal.portal_catalog
reference
=
str
(
context
.
getReference
())
+
"-Home.Page"
home_page
=
portal_catalog
.
getResultValue
(
portal_type
=
'Web Page'
,
reference
=
reference
)
reference
=
reference
,
validation_state
=
"published_alive"
)
if
home_page
:
content
=
home_page
.
getTextContent
()
else
:
content
=
""
return
[(
'project_title'
,
context
.
getTitle
()),
(
'jio_key'
,
context
.
getRelativeUrl
()),
(
'home_page_content'
,
content
)]
if
home_page
:
home_page_jio_key
=
home_page
.
getRelativeUrl
()
else
:
home_page_jio_key
=
""
return
[(
'project_title'
,
context
.
getTitle
()),
(
'jio_key'
,
context
.
getRelativeUrl
()),
(
'home_page_jio_key'
,
home_page_jio_key
),
(
'home_page_content'
,
content
)]
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_project_info.js.js
View file @
a7359e8e
...
...
@@ -18,35 +18,32 @@ lockGadgetInQueue, unlockGadgetInQueue, Handlebars*/
link_element
.
classList
.
remove
(
"
ui-disabled
"
);
}
function
generateAjaxPromise
(
url
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
jIO
.
util
.
ajax
({
url
:
url
,
dataType
:
'
text
'
});
})
.
push
(
function
(
evt
)
{
return
evt
.
target
.
responseText
.
split
(
'
\n
'
);
});
function
getActionListByName
(
view_list
,
name
)
{
return
view_list
.
filter
(
d
=>
d
.
name
===
name
)[
0
].
href
;
}
function
setHTMLWithPromiseResult
(
span_element
,
promise
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
promise
;
function
setLastTestResult
(
gadget
,
project_title
,
span_element
)
{
var
query
=
'
portal_type:="Benchmark Result" AND source_project_title:"
'
+
project_title
+
'
"
'
;
return
gadget
.
jio_allDocs
({
query
:
query
,
limit
:
2
,
//first result could be the running test
sort_on
:
[[
'
creation_date
'
,
'
descending
'
]],
select_list
:
[
'
simulation_state
'
]
})
.
push
(
function
(
result
)
{
if
(
result
[
0
]
===
"
1
"
)
{
.
push
(
function
(
result_list
)
{
var
i
,
state
;
result_list
=
result_list
.
data
.
rows
;
for
(
i
=
0
;
i
<
result_list
.
length
;
i
=
i
+
1
)
{
state
=
result_list
[
i
].
value
.
simulation_state
;
if
(
state
===
"
stopped
"
||
state
===
"
public_stopped
"
)
{
span_element
.
classList
.
add
(
"
pass
"
);
}
else
{
break
;
}
else
if
(
state
===
"
failed
"
)
{
span_element
.
classList
.
add
(
"
fail
"
);
break
;
}
});
}
function
getActionListByName
(
view_list
,
name
)
{
return
view_list
.
filter
(
d
=>
d
.
name
===
name
)[
0
].
href
;
});
}
function
getUrlParameters
(
jio_key
,
view
,
sort_list
,
column_list
,
extended_search
)
{
...
...
@@ -68,13 +65,15 @@ lockGadgetInQueue, unlockGadgetInQueue, Handlebars*/
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
getUrlParameter
"
,
"
getUrlParameter
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
)
.
declareMethod
(
'
render
'
,
function
(
options
)
{
var
state_dict
=
{
jio_key
:
options
.
jio_key
||
""
,
project_title
:
options
.
project_title
,
home_page_content
:
options
.
home_page_content
home_page_content
:
options
.
home_page_content
,
home_page_jio_key
:
options
.
home_page_jio_key
};
return
this
.
changeState
(
state_dict
);
})
...
...
@@ -82,11 +81,8 @@ lockGadgetInQueue, unlockGadgetInQueue, Handlebars*/
.
onStateChange
(
function
(
modification_dict
)
{
var
gadget
=
this
,
base_site
=
window
.
location
.
origin
+
window
.
location
.
pathname
,
project_url
=
base_site
+
modification_dict
.
jio_key
,
// REPLACE THIS AJAX REQUEST WITH JIO
last_test_result_promise
=
generateAjaxPromise
(
project_url
+
"
/Project_lastTestResult
"
);
setHTMLWithPromiseResult
(
document
.
getElementById
(
"
test_result_span
"
),
last_test_result_promise
);
project_url
=
base_site
+
modification_dict
.
jio_key
;
setLastTestResult
(
gadget
,
modification_dict
.
project_title
,
document
.
getElementById
(
"
test_result_span
"
));
return
gadget
.
jio_getAttachment
(
modification_dict
.
jio_key
,
"
links
"
)
.
push
(
function
(
erp5_document
)
{
var
milestone_view
=
getActionListByName
(
ensureArray
(
erp5_document
.
_links
.
view
),
"
milestone
"
);
...
...
@@ -118,7 +114,8 @@ lockGadgetInQueue, unlockGadgetInQueue, Handlebars*/
getUrlParameters
(
'
task_module
'
,
"
view
"
,
[[
"
delivery.start_date
"
,
"
descending
"
]],
[
"
title
"
,
"
delivery.start_date
"
,
"
delivery.stop_date
"
,
"
destination_decision_title
"
,
"
source_title
"
,
"
destination_title
"
,
"
total_quantity
"
,
"
task_line_quantity_unit_title
"
],
(
'
source_project_title: "
'
+
modification_dict
.
project_title
+
'
" AND selection_domain_state_task_domain: "not_confirmed"
'
))
]);
(
'
source_project_title: "
'
+
modification_dict
.
project_title
+
'
" AND selection_domain_state_task_domain: "not_confirmed"
'
)),
getUrlParameters
(
modification_dict
.
home_page_jio_key
,
"
view
"
)
]);
})
.
push
(
function
(
url_list
)
{
enableLink
(
document
.
getElementById
(
"
milestone_link
"
),
url_list
[
0
]);
...
...
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