From a139131c26f20093bddcb71ed83b0672ad2ed557 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sun, 31 Jan 2016 11:11:56 +0300
Subject: [PATCH] Little ZabbixAPIService refactor.

---
 plugins/datasource-zabbix/zabbixAPI.js        | 6 +++---
 plugins/datasource-zabbix/zabbixAPIService.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/datasource-zabbix/zabbixAPI.js b/plugins/datasource-zabbix/zabbixAPI.js
index 00b41dd..81ca4a1 100644
--- a/plugins/datasource-zabbix/zabbixAPI.js
+++ b/plugins/datasource-zabbix/zabbixAPI.js
@@ -32,7 +32,7 @@ function (angular, _) {
     p.request = function(method, params) {
       var self = this;
       if (this.auth) {
-        return ZabbixAPIService._request(this.url, method, params, this.requestOptions, this.auth)
+        return ZabbixAPIService.request(this.url, method, params, this.requestOptions, this.auth)
           .then(function(result) {
             return result;
           },
@@ -43,7 +43,7 @@ function (angular, _) {
               return ZabbixAPIService.login(self.url, self.username, self.password, self.requestOptions)
                 .then(function(auth) {
                   self.auth = auth;
-                  return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
+                  return ZabbixAPIService.request(self.url, method, params, self.requestOptions, self.auth);
                 });
             }
           });
@@ -53,7 +53,7 @@ function (angular, _) {
         return ZabbixAPIService.login(this.url, this.username, this.password, this.requestOptions)
           .then(function(auth) {
             self.auth = auth;
-            return ZabbixAPIService._request(self.url, method, params, self.requestOptions, self.auth);
+            return ZabbixAPIService.request(self.url, method, params, self.requestOptions, self.auth);
           });
       }
     };
diff --git a/plugins/datasource-zabbix/zabbixAPIService.js b/plugins/datasource-zabbix/zabbixAPIService.js
index 2212a5a..0b12b8d 100644
--- a/plugins/datasource-zabbix/zabbixAPIService.js
+++ b/plugins/datasource-zabbix/zabbixAPIService.js
@@ -16,7 +16,7 @@ function (angular) {
      * Request data from Zabbix API
      * @return {object}  response.result
      */
-    this._request = function(api_url, method, params, options, auth) {
+    this.request = function(api_url, method, params, options, auth) {
       var requestData = {
         jsonrpc: '2.0',
         method: method,
@@ -70,7 +70,7 @@ function (angular) {
         user: username,
         password: password
       };
-      return this._request(api_url, 'user.login', params, options, null);
+      return this.request(api_url, 'user.login', params, options, null);
     };
 
     /**
@@ -78,7 +78,7 @@ function (angular) {
      * Matches the version of Zabbix starting from Zabbix 2.0.4
      */
     this.getVersion = function(api_url, options) {
-      return this._request(api_url, 'apiinfo.version', [], options);
+      return this.request(api_url, 'apiinfo.version', [], options);
     };
 
   });