Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

iss #19 - Rewrite query editor switching for more scalability.

Browse Source
This commit is contained in:
Alexander Zobnin
2015-07-27 17:49:30 +03:00
parent fd67ed6194
commit 72478c0bc6
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zabbix/partials/query.editor.html
View File

@@ -17,13 +17,13 @@
</a> </a>
<ul class="dropdown-menu pull-right" role="menu"> <ul class="dropdown-menu pull-right" role="menu">
<!-- Switch to IT Services editor --> <!-- Switch to IT Services editor -->
<li role="menuitem" ng-hide="target.ITService"> <li role="menuitem" ng-hide="target.mode == 1">
<a class="pointer" tabindex="1" <a class="pointer" tabindex="1"
ng-click="switchEditorMode()">IT Services</a> ng-click="switchEditorMode(1)">IT services</a>
</li> </li>
<li role="menuitem" ng-show="target.ITService"> <li role="menuitem" ng-show="target.mode">
<a class="pointer" tabindex="1" <a class="pointer" tabindex="1"
ng-click="switchEditorMode()">Items</a> ng-click="switchEditorMode(0)">Items</a>
</li> </li>
<li class="divider" role="menuitem"></li> <li class="divider" role="menuitem"></li>
<li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li> <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
@@ -53,7 +53,7 @@
</ul> </ul>
<!-- IT Service editor --> <!-- IT Service editor -->
<ul class="tight-form-list" role="menu" ng-show="target.ITService"> <ul class="tight-form-list" role="menu" ng-show="target.mode == 1">
<li class="tight-form-item input-small">IT Service</li> <li class="tight-form-item input-small">IT Service</li>
<li> <li>
<select class="tight-form-input input-large" <select class="tight-form-input input-large"
@@ -75,7 +75,7 @@
</li> </li>
</ul> </ul>
<ul class="tight-form-list" role="menu" ng-hide="target.ITService"> <ul class="tight-form-list" role="menu" ng-hide="target.mode">
<!-- Alias --> <!-- Alias -->
<li> <li>
<input type="text" <input type="text"
@@ -136,7 +136,7 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form" ng-hide="target.ITService"> <div class="tight-form" ng-hide="target.mode">
<ul class="tight-form-list" role="menu"> <ul class="tight-form-list" role="menu">
<li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li> <li class="tight-form-item" style="min-width: 15px; text-align: center">&nbsp</li>
<li class="tight-form-item"> <li class="tight-form-item">

12
zabbix/queryCtrl.js
View File

@@ -13,7 +13,7 @@ define([
$scope.init = function () { $scope.init = function () {
$scope.targetLetters = targetLetters; $scope.targetLetters = targetLetters;
if ($scope.target.ITService) { if ($scope.target.mode === 1) {
$scope.slaPropertyList = [ $scope.slaPropertyList = [
{name: "Status", property: "status"}, {name: "Status", property: "status"},
{name: "SLA", property: "sla"}, {name: "SLA", property: "sla"},
@@ -43,8 +43,14 @@ define([
$scope.target.errors = validateTarget($scope.target); $scope.target.errors = validateTarget($scope.target);
}; };
$scope.switchEditorMode = function () { /**
$scope.target.ITService = !$scope.target.ITService; * Switch query editor to specified mode.
* Modes:
* 0 - items
* 1 - IT services
*/
$scope.switchEditorMode = function (mode) {
$scope.target.mode = mode;
$scope.init(); $scope.init();
}; };