ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-843 Fixed buttons visibility in case of filtration.
Date Fri, 12 Feb 2016 02:47:16 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 f7beeac96 -> 11c6e0a1c


IGNITE-843 Fixed buttons visibility in case of filtration.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0569a4b0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0569a4b0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0569a4b0

Branch: refs/heads/ignite-843-rc2
Commit: 0569a4b0b3616908aeb55257c33122b92dd75606
Parents: 5d0fbe5
Author: vsisko <vsisko@gridgain.com>
Authored: Fri Feb 12 09:46:56 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Feb 12 09:46:56 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/clusters-controller.js             | 6 ++++++
 .../src/main/js/views/configuration/clusters.jade              | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0569a4b0/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 41df7ab..7681a6e 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -46,6 +46,12 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
         $scope.widthIsSufficient = $common.widthIsSufficient;
         $scope.saveBtnTipText = $common.saveBtnTipText;
 
+        $scope.contentVisible = function () {
+            var item = $scope.backupItem;
+
+            return item && (!item._id || _.find($scope.displayedRows, {_id: item._id}));
+        };
+
         $scope.trustManagersConfigured = function() {
             return $scope.backupItem.sslEnabled && $common.isDefined($scope.backupItem.sslContextFactory)
&&
                 !$common.isEmptyArray($scope.backupItem.sslContextFactory.trustManagers);

http://git-wip-us.apache.org/repos/asf/ignite/blob/0569a4b0/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index 3c3db82..da32e0d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -34,7 +34,7 @@ include ../includes/infos
                 -var cloneTip = '"Clone current ' + objectName + '"'
                 -var undoTip = '"Undo all changes for current ' + objectName + '"'
 
-                div(ng-show='backupItem' style='display: inline-block;')
+                div(ng-show='contentVisible()' style='display: inline-block;')
                     .panel-tip-container(ng-hide='!backupItem || backupItem._id')
                         a.btn.btn-primary(ng-disabled='!ui.inputForm.$dirty' ng-click='ui.inputForm.$dirty
&& saveItem()' bs-tooltip='' data-title='{{saveBtnTipText(ui.inputForm.$dirty, "#{objectName}")}}'
data-placement='bottom' data-trigger='hover') Save
                     .panel-tip-container(ng-show='backupItem._id')
@@ -50,7 +50,7 @@ include ../includes/infos
                 hr
             .bs-affix-fix
             div(bs-collapse='' data-allow-multiple='true' ng-model='ui.activePanels')
-                form.form-horizontal(name='ui.inputForm' ng-show='backupItem && (!backupItem._id
|| _.find(displayedRows, {_id: backupItem._id}))' novalidate)
+                form.form-horizontal(name='ui.inputForm' ng-show='contentVisible()' novalidate)
                     .panel-group(ng-click='triggerDigest = true')
                         ignite-configuration-clusters-general
                         .advanced-options


Mime
View raw message