expandItemName function moved to helperFunctions.js.

2015-07-11 11:09:34 +03:00
parent 082d56e1a6
commit c3def217de
4 changed files with 31 additions and 32 deletions
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -171,9 +171,9 @@ function (angular, _) {
      $scope.datasource.zabbixAPI.itemFindQuery(groups, hosts, apps).then(function (items) {
        // Show only unique item names
        var uniq_items = _.map(_.uniq(items, function (item) {
-          return $scope.datasource.zabbixAPI.expandItemName(item);
+          return zabbixHelperSrv.expandItemName(item);
        }), function (item) {
-          return {name: $scope.datasource.zabbixAPI.expandItemName(item)};
+          return {name: zabbixHelperSrv.expandItemName(item)};
        });
        $scope.metric.itemList = $scope.metric.itemList.concat(uniq_items);
      });