diff options
author | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
---|---|---|
committer | Aleš Smodiš <aless@guru.si> | 2015-12-15 11:30:19 +0100 |
commit | ed62d492323011741027c9d79973ccd30b4b0494 (patch) | |
tree | 26121de183f0f2019857581198b4e31a9ede5456 /js/codeq/core.js | |
parent | 13c8be3d82350082093df8cd65771f09fcb83c54 (diff) | |
parent | 7de6dca9112d292803b801e0d370c45b0ca0eb13 (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web
Conflicts:
js/codeq/navigation.js
Diffstat (limited to 'js/codeq/core.js')
-rw-r--r-- | js/codeq/core.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/codeq/core.js b/js/codeq/core.js index 28767f7..22f6a50 100644 --- a/js/codeq/core.js +++ b/js/codeq/core.js @@ -307,7 +307,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ traversedPath.push(fragment); if (branch[resourceName]) candidate = traversedPath.join('/') + '/' + resourceName; } - if (candidate) return candidate; + if (candidate) return codeq.ajaxPrefix + candidate; codeq.log.error('Resource ' + resourceName + ' was not found; path: "' + resourceBranches.join('/') + '"'); return null; }; @@ -610,9 +610,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ codeq.log.info('App reset: ' + (reason || 'no reason given')); codeq.globalStateMachine.transition('login'); codeq.wait( - codeq.comms.logout() - .finally(codeq.comms.disconnect) - .fail(function () {}) // ignore errors + codeq.comms.getSid() == null ? Q() : codeq.comms.logout() + .finally( + codeq.comms.disconnect + ) + .fail(function (e) { + codeq.log.debug(e) + }) // ignore errors ) .then(function () { if (reason) { |