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
a3532c60
Commit
a3532c60
authored
Jun 10, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: better handling of editable views
parent
1651c8f9
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
21 deletions
+18
-21
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.js
...teItem/web_page_module/gadget_officejs_common_utils_js.js
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.xml
...eItem/web_page_module/gadget_officejs_common_utils_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.js
...le/gadget_officejs_controller_page_local_controller_js.js
+1
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
...e/gadget_officejs_controller_page_local_controller_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
...plateItem/web_page_module/gadget_officejs_form_view_js.js
+1
-1
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
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_create_document_js.js
...eb_page_module/gadget_officejs_page_create_document_js.js
+4
-6
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_create_document_js.xml
...b_page_module/gadget_officejs_page_create_document_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.js
.../web_page_module/gadget_officejs_page_handle_action_js.js
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.xml
...web_page_module/gadget_officejs_page_handle_action_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.js
View file @
a3532c60
...
...
@@ -89,7 +89,7 @@
return
has_more_dict
;
})
.
declareMethod
(
"
getFormDefinition
"
,
function
(
portal_type
,
action_reference
,
source_reference
)
{
.
declareMethod
(
"
getFormDefinition
"
,
function
(
portal_type
,
action_reference
)
{
var
gadget
=
this
,
query
,
action_type
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.xml
View file @
a3532c60
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.1
341.45833.1984
8
</string>
</value>
<value>
<string>
976.1
9490.13565.2438
8
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>
15
59144323.98
</float>
<float>
15
60157575.92
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.js
View file @
a3532c60
...
...
@@ -73,8 +73,7 @@
child_gadget_url
:
child_gadget_url
,
form_definition
:
form_definition
,
form_type
:
form_type
,
//TODO editable should come from getFormInfo(form_definition)
editable
:
true
,
editable
:
options
.
editable
,
view
:
options
.
view
||
default_view
,
front_page
:
front_page
});
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
View file @
a3532c60
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.1
354.15427.27101
</string>
</value>
<value>
<string>
976.1
9489.33473.10973
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>
15
59069474.12
</float>
<float>
15
60166424.01
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
View file @
a3532c60
...
...
@@ -198,7 +198,7 @@
if
(
options
.
form_definition
.
has_more_views
)
{
header_dict
.
tab_url
=
url_list
[
0
];
}
if
(
options
.
editable
)
{
if
(
options
.
editable
===
"
true
"
)
{
header_dict
.
save_action
=
true
;
}
}
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
View file @
a3532c60
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.1
5215.11185.17510
</string>
</value>
<value>
<string>
976.1
9636.24453.35276
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>
15
59901212.98
</float>
<float>
15
60166356.4
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_create_document_js.js
View file @
a3532c60
/*global window, document, rJS
, RSVP
*/
/*jslint nomen: true, indent: 2, maxerr: 3 */
(
function
(
window
,
document
,
rJS
,
RSVP
)
{
/*global window, document, rJS */
/*jslint nomen: true, indent: 2, maxerr:
1
3 */
(
function
(
window
,
document
,
rJS
)
{
"
use strict
"
;
rJS
(
window
)
...
...
@@ -39,8 +39,6 @@
.
push
(
function
(
portal_type_result
)
{
portal_type
=
portal_type_result
;
// TODO: somehow (a generic action?) get the path string:${object_url}/Base_viewNewContentDialog
// for now hardcoded
// get corresponding form definition (only contains a select field)
return
gadget
.
jio_get
(
"
portal_skins/erp5_hal_json_style/Base_viewNewContentDialog
"
);
})
.
push
(
function
(
form_result
)
{
...
...
@@ -91,4 +89,4 @@
});
});
}(
window
,
document
,
rJS
,
RSVP
));
\ No newline at end of file
}(
window
,
document
,
rJS
));
\ No newline at end of file
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_create_document_js.xml
View file @
a3532c60
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.1
5382.16949.153
</string>
</value>
<value>
<string>
976.1
9418.14997.64017
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>
15
59912998.35
</float>
<float>
15
60156475.0
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.js
View file @
a3532c60
...
...
@@ -141,7 +141,7 @@
command
:
'
display
'
,
options
:
{
jio_key
:
jio_key
,
editable
:
true
editable
:
gadget
.
state
.
view
===
"
edit
"
}
});
});
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.xml
View file @
a3532c60
...
...
@@ -269,7 +269,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
5.61078.33779.341
</string>
</value>
<value>
<string>
97
6.19632.7478.53504
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>
15
59051938.53
</float>
<float>
15
60166193.19
</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