Merge pull request #142 from khoa-nd/master

Merged
chrisshayan · Jan 9, 2015 · 17aa004 · 17aa004
2 parents 7dffca5 + 4f2924a
commit 17aa004
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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() : "/";
       }