diff --git a/src/main/resources/dev/logback.groovy b/src/main/resources/dev/logback.groovy index 28292df94..22e4dd56e 100644 --- a/src/main/resources/dev/logback.groovy +++ b/src/main/resources/dev/logback.groovy @@ -15,8 +15,7 @@ appender("CONSOLE", ConsoleAppender) { } appender("FILE", RollingFileAppender) { - file = "techlooper.log" -// file = "${catalina.base}/logs/techlooper.log" + file = "${catalina.base}/logs/techlooper.log" rollingPolicy(FixedWindowRollingPolicy) { fileNamePattern = "techlooper_%i.log" minIndex = 1 diff --git a/src/main/webapp/assets/modules/common/connection.fac.js b/src/main/webapp/assets/modules/common/connection.fac.js index edbb1933c..75336612d 100644 --- a/src/main/webapp/assets/modules/common/connection.fac.js +++ b/src/main/webapp/assets/modules/common/connection.fac.js @@ -236,6 +236,7 @@ angular.module("Common").factory("connectionFactory", initialize: function () {} } + utils.registerNotification(jsonValue.notifications.logoutSuccess, instance.connectSocket); utils.registerNotification(jsonValue.notifications.loginSuccess, instance.connectSocket); utils.registerNotification(jsonValue.notifications.switchScope, $$.initialize); return instance; diff --git a/src/main/webapp/assets/modules/common/history.fac.js b/src/main/webapp/assets/modules/common/history.fac.js index ed61f14b4..d746fd1cf 100644 --- a/src/main/webapp/assets/modules/common/history.fac.js +++ b/src/main/webapp/assets/modules/common/history.fac.js @@ -25,13 +25,15 @@ angular.module("Common").factory("historyFactory", function (jsonValue, $locatio popHistory: function () { var url; // remove current item do {url = historyStack.pop()} while(exceptViews.indexOf(url) >= 0); - console.log(historyStack); //if (historyStack.length === 0) return "/"; //return historyStack.pop(); switch (utils.getView()) { case jsonValue.views.jobsSearchText: return jsonValue.routerUris.jobsSearch; + case jsonValue.views.analyticsSkill: + return jsonValue.routerUris.bubbleChart; + default: return historyStack.length > 0 ? historyStack.pop() : "/"; }