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 21:27:25 +00:00
parent 7eae04b1b9
commit a7f9487965
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/app.js
View file

@ -144,9 +144,8 @@ app = Sammy('#main', function (sam) {
installing = true; installing = true;
}, 1500); }, 1500);
} else {
loaded = false;
} }
loaded = false;
if ($('div.loader').length == 0) { if ($('div.loader').length == 0) {
setInterval(function () { setInterval(function () {
if (!loaded && $('div.loader').length == 0) { if (!loaded && $('div.loader').length == 0) {
@ -225,7 +224,7 @@ app = Sammy('#main', function (sam) {
if (installing) { if (installing) {
setInterval(function () { setInterval(function () {
if (window.location.hostname === args.domain) { if (window.location.hostname === args.domain) {
window.open('https://'+ args.domain +'/yunohost/admin'); document.location.href = 'https://'+ args.domain +'/yunohost/admin';
} else { } else {
c.checkInstall(function(isInstalled) { c.checkInstall(function(isInstalled) {
if (isInstalled) { if (isInstalled) {
@ -374,7 +373,7 @@ app = Sammy('#main', function (sam) {
domain = window.location.hostname; domain = window.location.hostname;
c.view('login', { 'domain': domain }); c.view('login', { 'domain': domain });
} else { } else {
c.view('login'); c.redirect('#/postinstall');
} }
}); });
}); });