Merge branch 'hotfix-25' into develop

2015-06-18 16:33:07 +03:00
parent 49e389efa5 7c757ddfff
commit bcde137718
3 changed files with 50 additions and 34 deletions
--- a/zabbix/datasource.js
+++ b/zabbix/datasource.js
@@ -287,7 +287,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);
@@ -799,4 +800,4 @@ function formatAcknowledges(acknowledges) {
  } else {
    return '';
  }
-}
+}