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
138
Merge Requests
138
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
3ceca50f
Commit
3ceca50f
authored
May 13, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: header add button removed
- adding elements is done via actions - comment cleanup needed
parent
1a032115
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
...e_module/gadget_officejs_controller_page_controller_js.js
+4
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
..._module/gadget_officejs_controller_page_controller_js.xml
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
...plateItem/web_page_module/gadget_officejs_form_view_js.js
+3
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
...lateItem/web_page_module/gadget_officejs_form_view_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
View file @
3ceca50f
...
...
@@ -61,9 +61,9 @@
})
.
push
(
function
(
result
)
{
form_definition
=
result
;
//TODO: solve add button
//
for backward compatibility (header add button - '+' icon)
if
(
form_definition
.
action_type
===
"
object_list
"
)
{
//TODO: solve add button
(header add button - '+' icon)
//
solved: add elements must be done via actions
/*
if (form_definition.action_type === "object_list") {
form_definition._links.action_object_new_content_action = {
page: "handle_action",
title: "New Post",
...
...
@@ -73,7 +73,7 @@
parent_portal_type: "Post Module",
source_reference: "for-future-thread-id"
};
}
}
*/
return
gadget_utils
.
getFormInfo
(
form_definition
);
})
.
push
(
function
(
form_info
)
{
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
View file @
3ceca50f
...
...
@@ -243,7 +243,7 @@
</tuple>
<state>
<tuple>
<float>
1557
496397.35
</float>
<float>
1557
758029.57
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
View file @
3ceca50f
...
...
@@ -140,10 +140,11 @@
page_title
=
options
.
doc
.
title
;
}
erp5_document
=
form_json
.
erp5_document
;
if
(
erp5_document
.
_links
&&
erp5_document
.
_links
.
action_object_new_content_action
)
{
//add elements must be done via actions, so no 'add' button
/*if (erp5_document._links && erp5_document._links.action_object_new_content_action) {
url_for_parameter_list.push({command: 'change', options: erp5_document._links.action_object_new_content_action});
add_url = true;
}
}
*/
return
RSVP
.
all
([
this_gadget
.
getUrlForList
(
url_for_parameter_list
),
this_gadget
.
isDesktopMedia
(),
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
View file @
3ceca50f
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
975.3946
7.50073.9608
</string>
</value>
<value>
<string>
975.3946
8.60846.58214
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>
1557
424135.
7
</float>
<float>
1557
758125.0
7
</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