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
1
Merge Requests
1
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
Boxiang Sun
erp5
Commits
a5bd823c
Commit
a5bd823c
authored
Feb 14, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_officejs] Allow to preset the linshare username
parent
2d7b8f2c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.js
...dule/gadget_officejs_page_ojs_linshare_configurator_js.js
+14
-10
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.xml
...ule/gadget_officejs_page_ojs_linshare_configurator_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.js
View file @
a5bd823c
...
@@ -13,7 +13,16 @@
...
@@ -13,7 +13,16 @@
})
})
.
push
(
function
(
setting
)
{
.
push
(
function
(
setting
)
{
var
configuration
=
{},
var
configuration
=
{},
attachment_synchro
=
setting
[
1
]
!==
""
;
attachment_synchro
=
setting
[
1
]
!==
""
,
linshare_json
=
{
type
:
"
linshare
"
,
url
:
options
.
url
};
if
(
options
.
username
||
options
.
password
)
{
linshare_json
.
access_token
=
window
.
btoa
(
options
.
username
+
'
:
'
+
options
.
password
);
}
configuration
=
{
configuration
=
{
type
:
"
replicate
"
,
type
:
"
replicate
"
,
query
:
{
query
:
{
...
@@ -69,13 +78,7 @@
...
@@ -69,13 +78,7 @@
},
},
sub_storage
:
{
sub_storage
:
{
type
:
"
query
"
,
type
:
"
query
"
,
sub_storage
:
{
sub_storage
:
linshare_json
type
:
"
linshare
"
,
url
:
options
.
url
,
access_token
:
window
.
btoa
(
options
.
username
+
'
:
'
+
options
.
password
)
}
}
}
}
}
}
}
...
@@ -111,7 +114,8 @@
...
@@ -111,7 +114,8 @@
var
gadget
=
this
;
var
gadget
=
this
;
if
(
options
.
url
)
{
if
(
options
.
url
)
{
return
gadget
.
changeState
({
return
gadget
.
changeState
({
url
:
options
.
url
||
""
url
:
options
.
url
||
""
,
username
:
options
.
username
||
""
});
});
}
}
return
gadget
.
getSetting
(
'
linshare_storage
'
,
""
)
return
gadget
.
getSetting
(
'
linshare_storage
'
,
""
)
...
@@ -160,7 +164,7 @@
...
@@ -160,7 +164,7 @@
"
my_username
"
:
{
"
my_username
"
:
{
"
description
"
:
""
,
"
description
"
:
""
,
"
title
"
:
"
Username
"
,
"
title
"
:
"
Username
"
,
"
default
"
:
""
,
"
default
"
:
gadget
.
state
.
username
||
""
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
required
"
:
1
,
"
editable
"
:
1
,
"
editable
"
:
1
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.xml
View file @
a5bd823c
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
973.
24661.29279.57753
</string>
</value>
<value>
<string>
973.
43371.54750.44595
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
49019475.4
</float>
<float>
15
50139619.39
</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