YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Postinstall

Browse source
This commit is contained in:
kload 2014-05-25 22:17:42 +00:00
parent c45adca02f
commit 83199e1a9a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/app.js
View file

@ -104,7 +104,7 @@ app = Sammy('#main', function (sam) {
callback(data.installed); callback(data.installed);
}) })
.fail(function() { .fail(function() {
callback(false); callback(undefined);
}); });
}, },
@ -224,17 +224,13 @@ app = Sammy('#main', function (sam) {
if (installing) { if (installing) {
checkInstall = setInterval(function () { checkInstall = setInterval(function () {
c.checkInstall(function(isInstalled) { c.checkInstall(function(isInstalled) {
if (isInstalled) { if (isInstalled || (window.location.hostname === args.domain && typeof isInstalled === 'undefined')) {
c.flash('success', y18n.t('installation_complete')); c.flash('success', y18n.t('installation_complete'));
clearInterval(checkInstall); clearInterval(checkInstall);
if (window.location.hostname === args.domain) { document.location.href = 'https://'+ window.location.hostname +'/yunohost/admin/#/login';
document.location.href = 'https://'+ args.domain +'/yunohost/admin';
} else {
c.redirect('#/login');
}
} }
}); });
}, 5000); }, 6000);
} else { } else {
c.flash('fail', y18n.t('error_occured')); c.flash('fail', y18n.t('error_occured'));
} }