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
preetwinder
erp5
Commits
29919b2f
Commit
29919b2f
authored
Aug 11, 2017
by
preetwinder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs] Fix double links in message and set message to error if get request fails.
parent
50570e4e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
bt5/erp5_officejs/PathTemplateItem/web_page_module/jio_fbstorage_js.js
...cejs/PathTemplateItem/web_page_module/jio_fbstorage_js.js
+3
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/jio_fbstorage_js.xml
...ejs/PathTemplateItem/web_page_module/jio_fbstorage_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_fb_document_list_js.js
...thTemplateItem/web_page_module/ojs_fb_document_list_js.js
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_fb_document_list_js.xml
...hTemplateItem/web_page_module/ojs_fb_document_list_js.xml
+1
-1
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/jio_fbstorage_js.js
View file @
29919b2f
...
...
@@ -32,7 +32,6 @@
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
console
.
log
(
'
Ajax fetch for get
'
);
console
.
log
(
that
.
_default_field_list
);
return
jIO
.
util
.
ajax
({
type
:
"
GET
"
,
url
:
get_post_template
.
expand
({
post_id
:
id
,
...
...
@@ -44,6 +43,9 @@
},
function
(
err
)
{
console
.
log
(
'
Ajax fetch for get failed
'
,
err
);
if
(
err
.
message
)
{
return
{
'
message
'
:
err
.
message
};
}
});
};
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/jio_fbstorage_js.xml
View file @
29919b2f
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
961.2
0894.37088.58897
</string>
</value>
<value>
<string>
961.2
2079.38369.25429
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
1502
382636.2
</float>
<float>
1502
453744.89
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_fb_document_list_js.js
View file @
29919b2f
...
...
@@ -25,7 +25,7 @@
param_list
[
0
].
select_list
.
push
(
'
link
'
);
return
gadget
.
jio_allDocs
(
param_list
[
0
])
.
push
(
function
(
result
)
{
var
i
,
date
,
message
,
len
=
result
.
data
.
total_rows
;
var
i
,
date
,
message
,
l
ink
,
l
en
=
result
.
data
.
total_rows
;
for
(
i
=
0
;
i
<
len
;
i
+=
1
)
{
if
(
result
.
data
.
rows
[
i
].
value
.
hasOwnProperty
(
"
created_time
"
))
{
date
=
new
Date
(
result
.
data
.
rows
[
i
].
value
.
created_time
);
...
...
@@ -59,9 +59,9 @@
if
(
result
.
data
.
rows
[
i
].
value
.
story
)
{
message
+=
'
'
+
result
.
data
.
rows
[
i
].
value
.
story
;
}
var
link
=
result
.
data
.
rows
[
i
].
value
.
link
;
link
=
result
.
data
.
rows
[
i
].
value
.
link
;
if
(
link
)
{
if
(
!
(
message
==
link
.
slice
(
0
,
-
1
)
||
message
==
link
)
)
{
if
(
message
.
indexOf
(
link
.
slice
(
0
,
-
1
))
==
-
1
)
{
message
+=
'
'
+
result
.
data
.
rows
[
i
].
value
.
link
.
slice
(
0
,
100
)
+
'
...
'
;
}
}
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_fb_document_list_js.xml
View file @
29919b2f
...
...
@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
<float>
1502
372527.27
</float>
<float>
1502
451315.0
</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