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
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Noah Brackenbury
erp5
Commits
56ac7b76
Commit
56ac7b76
authored
Aug 04, 2017
by
Vincent Bechu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs] Fix for pass test and add content_type when add onlyoffice document
parent
ee811272
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
11 deletions
+23
-11
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_appcache.xml
...page_module/gadget_officejs_bookmark_manager_appcache.xml
+5
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.js
...e_module/gadget_officejs_bookmark_page_add_bookmark_js.js
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.xml
..._module/gadget_officejs_bookmark_page_add_bookmark_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.js
...eItem/web_page_module/gadget_officejs_bookmark_view_js.js
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.xml
...Item/web_page_module/gadget_officejs_bookmark_view_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.js
...e_module/gadget_officejs_erp5_page_ojs_add_document_js.js
+9
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml
..._module/gadget_officejs_erp5_page_ojs_add_document_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_appcache.xml
View file @
56ac7b76
...
...
@@ -193,6 +193,9 @@ gadget_erp5_search_editor.js\n
gadget_erp5_sort_editor.html\n
gadget_erp5_sort_editor.js\n
\n
gadget_officejs_bookmark_manager_router.html\n
gadget_officejs_jio_bookmark_view.html\n
gadget_officejs_jio_bookmark_view.js\n
gadget_erp5_page_ojs_add_bookmark.html\n
gadget_erp5_page_ojs_add_bookmark.js\n
gadget_erp5_page_ojs_bookmark_list.html\n
...
...
@@ -347,7 +350,7 @@ NETWORK:\n
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.
9215.29642.18432
</string>
</value>
<value>
<string>
961.
11869.34421.55569
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -365,7 +368,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>
1501
681934.74
</float>
<float>
1501
841135.17
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.js
View file @
56ac7b76
...
...
@@ -28,7 +28,7 @@
})
.
push
(
function
()
{
// Workaround, find a way to open document without break gadget.
return
gadget
.
redirect
({
"
command
"
:
"
change
"
,
"
options
"
:
{
"
page
"
:
"
ojs_
document
_list
"
}});
return
gadget
.
redirect
({
"
command
"
:
"
change
"
,
"
options
"
:
{
"
page
"
:
"
ojs_
bookmark
_list
"
}});
});
})
...
...
@@ -77,7 +77,7 @@
"
title
"
:
"
Url
"
,
"
default
"
:
options
.
url_string
||
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
required
"
:
1
,
"
editable
"
:
1
,
"
key
"
:
"
url_string
"
,
"
hidden
"
:
0
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.xml
View file @
56ac7b76
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.1
0686.10882.5973
</string>
</value>
<value>
<string>
961.1
1865.36663.5376
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
1501
773055.42
</float>
<float>
1501
841031.15
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.js
View file @
56ac7b76
...
...
@@ -71,7 +71,7 @@
return
gadget
.
translateHtml
(
template
({
url_string
:
gadget
.
state
.
doc
.
url_string
}));
})
.
push
(
function
(
html
)
{
gadget
.
props
.
element
.
innerHTML
=
html
;
gadget
.
element
.
querySelector
(
'
.template-view
'
)
.
innerHTML
=
html
;
return
gadget
.
getDeclaredGadget
(
'
form_view
'
);
})
.
push
(
function
(
form_gadget
)
{
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.xml
View file @
56ac7b76
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.
9092.3808.5495
</string>
</value>
<value>
<string>
961.
11872.7503.60654
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
1501
746726
.2
</float>
<float>
1501
841404
.2
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.js
View file @
56ac7b76
...
...
@@ -3,6 +3,12 @@
(
function
(
window
,
rJS
,
RSVP
)
{
"
use strict
"
;
var
content_type
=
{
Spreadsheet
:
'
application/x-asc-spreadsheet
'
,
Presentation
:
'
application/x-asc-presentation
'
,
Text
:
'
application/x-asc-text
'
};
rJS
(
window
)
/////////////////////////////////////////////////////////////////
// Acquired methods
...
...
@@ -24,6 +30,9 @@
})
.
push
(
function
(
doc
)
{
doc
.
modification_date
=
(
new
Date
()).
toISOString
();
if
(
content_type
.
hasOwnProperty
(
doc
.
portal_type
))
{
doc
.
content_type
=
content_type
[
doc
.
portal_type
];
}
return
gadget
.
jio_post
(
doc
);
})
.
push
(
function
()
{
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_ojs_add_document_js.xml
View file @
56ac7b76
...
...
@@ -270,7 +270,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.1
0686.10882.5973
</string>
</value>
<value>
<string>
961.1
2010.33696.37768
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>
1501
773072.7
8
</float>
<float>
1501
849925.5
8
</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