pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[start page] fix bug 36884, fix bug 37678

Browse Source
This commit is contained in:
Maxim Kadushkin
2018-05-08 18:53:24 +03:00
parent 3de0273981
commit 001bdc3ad7
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/loginpage/deploy/index.html
View File

File diff suppressed because one or more lines are too long

6
common/loginpage/src/dlglogin.js
View File

@ -376,9 +376,6 @@ window.LoginDlg = function() {
return;
}
var url = `${portal}/api/2.0/authentication.json`;
var check_url = `${portal}/api/2.0/people/@self.json`;
disableDialog(true);
let _callback = (obj) => {
@ -714,7 +711,8 @@ window.LoginDlg = function() {
onsuccess: function(callback) {
if (!!callback)
events.success = callback;
}
},
portalavailable: requirePortalInfo
};
};

2
common/loginpage/src/panelabout.js
View File

@ -69,7 +69,7 @@
'<div class="box-ver">' +
`<div class="img-el ver-logo ${_opts.logocls}"></div><p></p>`+
`<div class="ver-version">${_opts.appname} ${_lang.strVersion} ${_opts.version}</div>${_opts.edition}<p></p>`+
`<a class="ver-checkupdate" href="#">${_lang.checkUpdates}</a><p />`+
`<a class="ver-checkupdate link" href="#">${_lang.checkUpdates}</a><p />`+
`<div class="ver-copyright">${_opts.rights}</div>`+
`<a class="ver-site link" target="popup" href="${_opts.link}">${_opts.site}</a>`+
'</div>'+

12
common/loginpage/src/panelconnect.js
View File

@ -319,7 +319,17 @@
for (let i in obj) {
let model = collection.find('name', i);
if (model) model.set('logged', obj[i].length > 0);
if (model) {
model.set('logged', false)
let _is_logged = obj[i].length > 0;
if ( _is_logged ) {
let _dlg_login = new LoginDlg();
_dlg_login.portalavailable(model.path).then(
data => { data.status == 'ok' && model.set('logged', true); },
error => {});
}
}
};
};