Merge branch 'hotfix-25'

2015-06-18 16:33:40 +03:00
parent 0d9cb5e7df 7c757ddfff
commit 14959358ad
1 changed files with 2 additions and 1 deletions
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -225,7 +225,8 @@ function (angular, _, kbn) {

          // Handle auth errors
          if (response.data.error.data == "Session terminated, re-login, please." ||
-              response.data.error.data == 'Not authorised.') {
+              response.data.error.data == "Not authorised." || 
+              response.data.error.data == "Not authorized") {
            return self.performZabbixAPILogin().then(function (response) {
              self.auth = response;
              return self.performZabbixAPIRequest(method, params);