You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/19 19:24:52 UTC
ambari git commit: AMBARI-8385 Multiple clicks possible when creating
a view instance. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 040794d9d -> 112300cd4
AMBARI-8385 Multiple clicks possible when creating a view instance. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/112300cd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/112300cd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/112300cd
Branch: refs/heads/trunk
Commit: 112300cd421494459f67b0ab9dd12bdc18db5534
Parents: 040794d
Author: ababiichuk <ab...@hortonworks.com>
Authored: Wed Nov 19 20:01:46 2014 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Wed Nov 19 20:01:46 2014 +0200
----------------------------------------------------------------------
.../controllers/ambariViews/CreateViewInstanceCtrl.js | 8 ++++++--
.../resources/ui/admin-web/app/views/ambariViews/create.html | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/112300cd/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
index 946d334..ac040ae 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
@@ -37,10 +37,10 @@ angular.module('ambariAdminConsole')
icon64_path: '',
properties: viewVersion.ViewVersionInfo.parameters,
description: ''
- };
+ };
});
}
-
+
$scope.$watch(function(scope) {
return scope.version;
@@ -66,6 +66,7 @@ angular.module('ambariAdminConsole')
$scope.nameValidationPattern = /^\s*\w*\s*$/;
$scope.save = function() {
+ if (!$scope.form.instanceCreateForm.submitted) {
$scope.form.instanceCreateForm.submitted = true;
if($scope.form.instanceCreateForm.$valid){
View.createInstance($scope.instance)
@@ -77,10 +78,13 @@ angular.module('ambariAdminConsole')
} else {
$location.path('/views/' + $scope.instance.view_name + '/versions/' + $scope.instance.version + '/instances/' + $scope.instance.instance_name + '/edit');
}
+ $scope.form.instanceCreateForm.submitted = false;
})
.catch(function(data) {
Alert.error('Cannot create instance', data.message);
+ $scope.form.instanceCreateForm.submitted = false;
});
+ }
}
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/112300cd/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
index 411e3cc..4186c85 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
@@ -115,7 +115,8 @@
</div>
<div class="col-sm-12 ">
- <button class="btn btn-primary pull-right left-margin save-button" ng-click="save()" type="submit">Save</button>
+ <button class="btn btn-primary pull-right left-margin save-button"
+ ng-class="{'disabled' : (form.instanceCreateForm.submitted)}" ng-click="save()" type="submit">Save</button>
<a href ng-click="cancel()" class="btn btn-default pull-right cancel-button">Cancel</a>
</div>