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
Issues
1
Issues
1
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
Roque
erp5
Commits
f6f91be3
Commit
f6f91be3
authored
Jun 25, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: solved todos and minor fixes
parent
37378bbd
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
19 additions
and
26 deletions
+19
-26
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.js
...teItem/web_page_module/gadget_officejs_common_utils_js.js
+1
-2
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
+2
-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
+3
-3
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_local_jio_js.js
...plateItem/web_page_module/gadget_officejs_local_jio_js.js
+0
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_local_jio_js.xml
...lateItem/web_page_module/gadget_officejs_local_jio_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_action_officejs_js.js
...eb_page_module/gadget_officejs_page_action_officejs_js.js
+1
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_action_officejs_js.xml
...b_page_module/gadget_officejs_page_action_officejs_js.xml
+2
-2
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
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.js
View file @
f6f91be3
...
@@ -191,8 +191,7 @@
...
@@ -191,8 +191,7 @@
form_definition
,
form_definition
,
query_type
,
query_type
,
query_parent
,
query_parent
,
query_reference
,
query_reference
;
hide_add_button
;
query_reference
=
new
SimpleQuery
({
query_reference
=
new
SimpleQuery
({
key
:
"
reference
"
,
key
:
"
reference
"
,
operator
:
""
,
operator
:
""
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.xml
View file @
f6f91be3
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.3427
6.53444.54016
</string>
</value>
<value>
<string>
976.3427
7.31524.53111
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1561
044808.85
</float>
<float>
1561
477042.12
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.js
View file @
f6f91be3
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
if
(
jio_document
.
portal_type
===
undefined
)
{
if
(
jio_document
.
portal_type
===
undefined
)
{
throw
new
Error
(
'
Can not display document:
'
+
options
.
jio_key
);
throw
new
Error
(
'
Can not display document:
'
+
options
.
jio_key
);
}
}
},
function
(
error
)
{})
},
function
()
{})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
getSetting
(
'
parent_portal_type
'
);
return
gadget
.
getSetting
(
'
parent_portal_type
'
);
})
})
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
return
result
;
return
result
;
},
function
(
error
)
{
},
function
()
{
return
gadget_utils
.
getFormDefinition
(
portal_type
,
default_view
);
return
gadget_utils
.
getFormDefinition
(
portal_type
,
default_view
);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
View file @
f6f91be3
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
31188.39410.57719
</string>
</value>
<value>
<string>
976.
41486.5263.546
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
0859510.75
</float>
<float>
156
1478018.46
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
View file @
f6f91be3
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
"
use strict
"
;
"
use strict
"
;
function
renderField
(
field_id
,
field_definition
,
document
)
{
function
renderField
(
field_id
,
field_definition
,
document
)
{
var
key
,
raw_value
,
tales_expr
,
override
,
final_value
,
result
=
{};
var
key
,
raw_value
,
tales_expr
,
override
,
final_value
,
item_list
,
result
=
{};
for
(
key
in
field_definition
.
values
)
{
for
(
key
in
field_definition
.
values
)
{
if
(
field_definition
.
values
.
hasOwnProperty
(
key
))
{
if
(
field_definition
.
values
.
hasOwnProperty
(
key
))
{
// order to get the final value (based on Field.py get_value)
// order to get the final value (based on Field.py get_value)
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
result
.
key
=
field_id
;
result
.
key
=
field_id
;
if
(
document
&&
document
.
hasOwnProperty
(
field_id
))
{
if
(
document
&&
document
.
hasOwnProperty
(
field_id
))
{
if
(
field_definition
.
type
===
"
ListField
"
)
{
if
(
field_definition
.
type
===
"
ListField
"
)
{
var
item_list
=
ensureArray
(
document
[
field_id
]).
map
(
function
(
item
)
{
item_list
=
ensureArray
(
document
[
field_id
]).
map
(
function
(
item
)
{
if
(
Array
.
isArray
(
item
))
{
return
item
;
}
if
(
Array
.
isArray
(
item
))
{
return
item
;
}
return
[
item
,
item
];
return
[
item
,
item
];
});
});
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
erp5_document
=
form_json
.
erp5_document
;
erp5_document
=
form_json
.
erp5_document
;
if
(
form_json
.
form_definition
.
allowed_sub_types_list
&&
if
(
form_json
.
form_definition
.
allowed_sub_types_list
&&
form_json
.
form_definition
.
allowed_sub_types_list
.
length
>
0
&&
form_json
.
form_definition
.
allowed_sub_types_list
.
length
>
0
&&
!
form_json
.
form_definition
.
hide_add_button
)
{
!
form_json
.
form_definition
.
hide_add_button
)
{
url_for_parameter_list
.
push
({
command
:
'
change
'
,
options
:
{
page
:
"
create_document
"
,
jio_key
:
options
.
jio_key
,
portal_type
:
options
.
portal_type
,
allowed_sub_types_list
:
form_json
.
form_definition
.
allowed_sub_types_list
}});
url_for_parameter_list
.
push
({
command
:
'
change
'
,
options
:
{
page
:
"
create_document
"
,
jio_key
:
options
.
jio_key
,
portal_type
:
options
.
portal_type
,
allowed_sub_types_list
:
form_json
.
form_definition
.
allowed_sub_types_list
}});
add_url
=
true
;
add_url
=
true
;
}
}
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
View file @
f6f91be3
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
34270.16303.42564
</string>
</value>
<value>
<string>
976.
41478.42498.65211
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1561
044820.12
</float>
<float>
1561
477012.65
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_local_jio_js.js
View file @
f6f91be3
...
@@ -209,10 +209,6 @@
...
@@ -209,10 +209,6 @@
console
.
log
(
"
Unauthorized access to storage, sync cancelled
"
);
console
.
log
(
"
Unauthorized access to storage, sync cancelled
"
);
return
;
return
;
}
}
//TODO: ignore sync error to make other officejs apps work
//until configuration manifest file name is get from app-settings
console
.
log
(
"
ERROR WHILE SYNC. Omitting error in non-migrated app
"
);
return
;
throw
error
;
throw
error
;
});
});
});
});
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_local_jio_js.xml
View file @
f6f91be3
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
21310.32010.65041
</string>
</value>
<value>
<string>
976.
41487.334.13226
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
0266942.88
</float>
<float>
156
1477486.75
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_action_officejs_js.js
View file @
f6f91be3
...
@@ -10,9 +10,7 @@
...
@@ -10,9 +10,7 @@
var
gadget_klass
=
rJS
(
window
),
var
gadget_klass
=
rJS
(
window
),
table_template
=
Handlebars
.
compile
(
gadget_klass
.
__template_element
table_template
=
Handlebars
.
compile
(
gadget_klass
.
__template_element
.
getElementById
(
"
table-template
"
)
.
getElementById
(
"
table-template
"
)
.
innerHTML
),
.
innerHTML
);
// TODO: check if there are other categories that are 'views' and find a less hardcoded way to get this
view_categories
=
[
"
object_view
"
,
"
object_jio_view
"
,
"
object_web_view
"
,
"
object_list
"
];
/** Render translated HTML of title + links
/** Render translated HTML of title + links
*
*
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_action_officejs_js.xml
View file @
f6f91be3
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
32543.31646.51592
</string>
</value>
<value>
<string>
976.
41484.14260.5085
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
0940816.44
</float>
<float>
156
1477231.0
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_create_document_js.xml
View file @
f6f91be3
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
33879.24839.5393
</string>
</value>
<value>
<string>
976.
41482.55363.33194
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1561
020945.58
</float>
<float>
1561
477140.56
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</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