opendev/gerrit
Code Issues Proposed changes

Merge "PolyGerrit: Fix redirecting to /login/ in gr-router"

Browse Source
This commit is contained in:
Becky Siegel
2017-07-26 18:52:58 +00:00
committed by Gerrit Code Review
parent fbfd17b8b3 d3d500a303
commit 7951b1c6a7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
polygerrit-ui/app/elements/core/gr-router/gr-router.js
View File

@@ -103,13 +103,18 @@
});
});
function redirectToLogin(data) {
const basePath = base || '';
page('/login/' + encodeURIComponent(data.substring(basePath.length)));
}
page('/dashboard/(.*)', loadUser, data => {
restAPI.getLoggedIn().then(loggedIn => {
if (loggedIn) {
data.params.view = Gerrit.Nav.View.DASHBOARD;
app.params = data.params;
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});
@@ -125,7 +130,7 @@
filter: null,
};
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});
@@ -140,7 +145,7 @@
filter: data.params.filter,
};
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});
@@ -154,7 +159,7 @@
filter: data.params.filter || null,
};
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});
@@ -273,7 +278,7 @@
adminView: 'gr-plugin-list',
};
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});
@@ -285,7 +290,7 @@
data.params.placeholder = true;
app.params = data.params;
} else {
page.redirect('/login/' + encodeURIComponent(data.canonicalPath));
redirectToLogin(data.canonicalPath);
}
});
});