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
146
Merge Requests
146
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
43dc43ad
Commit
43dc43ad
authored
Mar 04, 2020
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_project_ui: fix forum link query
parent
31b1a325
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
21 deletions
+16
-21
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
..._page_module/project_gadget_page_project_front_page_js.js
+14
-19
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
...page_module/project_gadget_page_project_front_page_js.xml
+2
-2
No files found.
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
View file @
43dc43ad
...
...
@@ -397,7 +397,7 @@
gadget
.
renderProjectDocumentInfo
();
gadget
.
renderOutdatedDocumentInfo
();
gadget
.
renderTestResultInfo
(
gadget
.
state
.
project_list
);
gadget
.
renderProjectForumLink
(
gadget
.
state
.
project_list
);
gadget
.
renderProjectForumLink
();
});
})
...
...
@@ -463,10 +463,9 @@
});
})
.
declareJob
(
"
renderProjectForumLink
"
,
function
(
project_list
)
{
.
declareJob
(
"
renderProjectForumLink
"
,
function
()
{
var
gadget
=
this
,
i
,
forum_link
,
forum_link_html
,
forum_link_list
,
link_query
=
getComplexQuery
({
"
portal_type
"
:
"
Link
"
,
...
...
@@ -475,33 +474,29 @@
"
AND
"
);
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
console
.
log
(
"
getting links
"
);
return
gadget
.
jio_allDocs
({
query
:
Query
.
objectToSearchText
(
link_query
),
limit
:
QUERY_LIMIT
,
//select_list: ['title', 'portal_type', 'parent__relative_url', "url_string"],
//select_list: ['title', 'portal_type', 'parent__relative_url', 'count(*)'],
select_list
:
[
'
title
'
,
'
url_string
'
],
// TODO FIX not found column url_string when group by parent
select_list
:
[
'
title
'
,
'
portal_type
'
],
//, 'url_string'],
group_by
:
[
'
parent_uid
'
],
sort_on
:
[[
"
modification_date
"
,
"
descending
"
]]
});
})
.
push
(
function
(
result
)
{
forum_link_list
=
result
.
data
.
rows
;
console
.
log
(
forum_link_list
);
/*for (i = 0; i < forum_link_list.length; i += 1) {
forum_link = forum_link_list[0];
if (forum_link && forum_link.value.parent__relative_url === project_list[i].id) {
forum_link_html = document.querySelector(
getProjectHtlmElementId(forum_link.value.parent__relative_url,
FORUM_LINK_TYPE,
FORUM_LINK_ID_SUFFIX, true)
);
forum_link_html.href = forum_link.value.url_string;
forum_link_html.innerHTML = forum_link.value.title;
for
(
i
=
0
;
i
<
forum_link_list
.
length
;
i
+=
1
)
{
forum_link_html
=
document
.
querySelector
(
getProjectHtlmElementId
(
getProjectId
(
forum_link_list
[
i
].
id
),
FORUM_LINK_TYPE
,
FORUM_LINK_ID_SUFFIX
,
true
)
);
if
(
forum_link_html
)
{
forum_link_html
.
href
=
forum_link_list
[
i
].
value
.
url_string
;
forum_link_html
.
innerHTML
=
forum_link_list
[
i
].
value
.
title
;
forum_link_html
.
classList
.
remove
(
"
ui-hidden
"
);
}
}
*/
}
});
})
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
View file @
43dc43ad
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.19
860.15245.4198
</string>
</value>
<value>
<string>
982.19
902.51210.17083
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
158334
0780.84
</float>
<float>
158334
3312.59
</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