You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/03 04:05:05 UTC
[1/2] ignite git commit: IGNITE-843 Validation fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 f146e4103 -> aac34fc07
IGNITE-843 Validation fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/034fed84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/034fed84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/034fed84
Branch: refs/heads/ignite-843-rc2
Commit: 034fed8473527b404765263d4d0aa2c257965c70
Parents: 93588b7
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 3 10:03:24 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 3 10:03:24 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/Form/group/group.directive.js | 6 ++++--
.../src/main/js/controllers/clusters-controller.js | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/034fed84/modules/control-center-web/src/main/js/app/modules/Form/group/group.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Form/group/group.directive.js b/modules/control-center-web/src/main/js/app/modules/Form/group/group.directive.js
index f64e17a..db03503 100644
--- a/modules/control-center-web/src/main/js/app/modules/Form/group/group.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/Form/group/group.directive.js
@@ -22,18 +22,20 @@ export default ['igniteFormGroup', [() => {
const link = (scope, el, attrs, [ngModelCtrl, ownFormCtrl, parentFormCtrl]) => {
const name = attrs.ngForm;
-
ngModelCtrl.$name = name;
parentFormCtrl.$addControl(ngModelCtrl);
parentFormCtrl.$removeControl(ownFormCtrl);
+ scope.value = scope.value || [];
parentFormCtrl.$defaults = parentFormCtrl.$defaults || {};
parentFormCtrl.$defaults[name] = _.cloneDeep(scope.value);
const setAsDefault = () => {
- if (!parentFormCtrl.$pristine) return;
+ if (!parentFormCtrl.$pristine)
+ return;
+ scope.value = scope.value || [];
parentFormCtrl.$defaults = parentFormCtrl.$defaults || {};
parentFormCtrl.$defaults[name] = _.cloneDeep(scope.value);
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/034fed84/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 ef61cfd..a9db26d 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
@@ -172,6 +172,12 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
selectFirstItem();
}
+ $scope.$watch('ui.inputForm.$valid', function(valid) {
+ if (valid && __original_value === JSON.stringify($cleanup($scope.backupItem))) {
+ $scope.ui.inputForm.$setPristine();
+ }
+ });
+
$scope.$watch('backupItem', function (val) {
var form = $scope.ui.inputForm;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aac34fc0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aac34fc0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aac34fc0
Branch: refs/heads/ignite-843-rc2
Commit: aac34fc073140485452aa4e6035be576bd4e85ba
Parents: 034fed8 f146e41
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 3 10:03:51 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 3 10:03:51 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/logo/main.js | 2 +-
.../src/main/js/public/images/ignite-logo.png | Bin 0 -> 5280 bytes
.../main/js/public/images/ignite-logo@2x.png | Bin 0 -> 6479 bytes
.../src/main/js/public/images/ignite_logo.png | Bin 5280 -> 0 bytes
.../main/js/public/images/ignite_logo@2x.png | Bin 6479 -> 0 bytes
.../src/main/js/public/images/pb-ignite.png | Bin 7255 -> 7449 bytes
.../src/main/js/public/images/pb-ignite@2x.png | Bin 21736 -> 20992 bytes
7 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------