sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'devel'

Browse Source
This commit is contained in:
Sebastien 2018-12-02 16:39:39 +02:00
commit 84472a9ba9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/Broken/webView/GeneralWebView.java
View File

@ -53,7 +53,7 @@ public class GeneralWebView {
model.addAttribute("isLogged", false); model.addAttribute("isLogged", false);
model.addAttribute("guild_name", ""); model.addAttribute("guild_name", "");
model.addAttribute("isAdmin", false); model.addAttribute("isAdmin", false);
return "index"; return CheckPage.getPageIfReady("index");
} }
try { try {
@ -85,7 +85,7 @@ public class GeneralWebView {
response.addCookie(cookie); response.addCookie(cookie);
} }
model.addAttribute("redirect_url", System.getenv("OAUTH_URL")); model.addAttribute("redirect_url", System.getenv("OAUTH_URL"));
return "login"; return CheckPage.getPageIfReady("login");
} catch (NumberFormatException e){ } catch (NumberFormatException e){
logger.debug("Unknown guild, flush cookies"); logger.debug("Unknown guild, flush cookies");
@ -93,7 +93,7 @@ public class GeneralWebView {
cookie.setPath("/"); cookie.setPath("/");
cookie.setMaxAge(0); cookie.setMaxAge(0);
response.addCookie(cookie); response.addCookie(cookie);
return "redirect:index"; return "redirect:/";
} }

6
src/main/resources/static/js/navabar.js
View File

@ -96,10 +96,10 @@ function getGuild(){
}).done(function (data) { }).done(function (data) {
console.log(data); console.log(data);
$('#guild_form').empty(); $('#guild_form').empty();
if(data.length === 0) if(data.length === 0 && location.pathname !== "/")
window.location.replace("/"); window.location.replace("/");
if(data.length === 1){ else if(data.length === 1){
Cookies.set('guild', data[0].id, { expires: 31 }); Cookies.set('guild', data[0].id, { expires: 31 });
window.location.reload(true); window.location.reload(true);
} }
@ -172,7 +172,7 @@ function checkToken() {
closeOnClick: false, // Closes side-nav on <a> clicks, useful for Angular/Meteor closeOnClick: false, // Closes side-nav on <a> clicks, useful for Angular/Meteor
draggable: true // Choose whether you can drag to open on touch screens, draggable: true // Choose whether you can drag to open on touch screens,
}); });
if (Cookies.get('guild') === undefined && location.pathname !== "/") { if (Cookies.get('guild') === undefined ) {
getGuild() getGuild()
} }