Inactive buttons should not be clickable

https://bugzilla.redhat.com/show_bug.cgi?id=1265203
ManageIQ · Sep 24, 2015 · 528446f · 528446f
1 parent feb675c
commit 528446f
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 32 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -23,6 +23,7 @@
 //= require directives/repository/valid_unc_path
 //= require services/miq_service
 //= require services/timer_option_service
+//= require controllers/buttons/button_group_controller
 //= require controllers/ems_common/ems_common_form_controller
 //= require controllers/host/host_form_controller
 //= require controllers/provider_foreman/provider_foreman_form_controller

diff --git a/app/assets/javascripts/controllers/buttons/button_group_controller.js b/app/assets/javascripts/controllers/buttons/button_group_controller.js
@@ -0,0 +1,7 @@
+ManageIQ.angularApplication.controller('buttonGroupController', ['$http', '$scope', 'miqService', function($http, $scope, miqService) {
+  var init = function() {
+    $scope.saveable = miqService.saveable;
+    $scope.disabledClick = miqService.disabledClick;
+  };
+  init();
+}]);
diff --git a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
@@ -29,9 +29,7 @@ ManageIQ.angularApplication.controller('emsCommonFormController', ['$http', '$sc
     };
     $scope.formId = emsCommonFormId;
     $scope.afterGet = false;
-    $scope.saveable = miqService.saveable;
     $scope.validateClicked = miqService.validateWithREST;
-    $scope.disabledClick = miqService.disabledClick;
     $scope.modelCopy = angular.copy( $scope.emsCommonModel );
     $scope.formFieldsUrl = $attrs.formFieldsUrl;
     $scope.createUrl = $attrs.createUrl;

diff --git a/app/assets/javascripts/controllers/host/host_form_controller.js b/app/assets/javascripts/controllers/host/host_form_controller.js
@@ -26,7 +26,6 @@ ManageIQ.angularApplication.controller('hostFormController', ['$http', '$scope',
     $scope.modelCopy = angular.copy( $scope.hostModel );
     $scope.afterGet = false;
     $scope.formId = hostFormId;
-    $scope.saveable = miqService.saveable;
     $scope.validateClicked = miqService.validateWithAjax;
     $scope.formFieldsUrl = $attrs.formFieldsUrl;
     $scope.createUrl = $attrs.createUrl;

diff --git a/app/assets/javascripts/controllers/ops/tenant_form_controller.js b/app/assets/javascripts/controllers/ops/tenant_form_controller.js
@@ -9,7 +9,6 @@ ManageIQ.angularApplication.controller('tenantFormController', ['$http', '$scope
       $scope.formId = tenantFormId;
       $scope.afterGet = false;
       $scope.modelCopy = angular.copy( $scope.tenantModel );
-      $scope.saveable = miqService.saveable;
 
       ManageIQ.angularApplication.$scope = $scope;
 

diff --git a/app/assets/javascripts/controllers/ops/tenant_quota_form_controller.js b/app/assets/javascripts/controllers/ops/tenant_quota_form_controller.js
@@ -7,7 +7,6 @@ ManageIQ.angularApplication.controller('tenantQuotaFormController',['$http', '$s
     $scope.formId = tenantQuotaFormId;
     $scope.afterGet = false;
     $scope.modelCopy = angular.copy( $scope.tenantQuotaModel );
-    $scope.saveable = miqService.saveable;
 
     ManageIQ.angularApplication.$scope = $scope;
     $scope.newRecord = false;

diff --git a/app/assets/javascripts/controllers/schedule/schedule_form_controller.js b/app/assets/javascripts/controllers/schedule/schedule_form_controller.js
@@ -27,7 +27,6 @@ ManageIQ.angularApplication.controller('scheduleFormController', ['$http', '$sco
     $scope.afterGet = false;
     $scope.validateClicked = miqService.validateWithAjax;
     $scope.modelCopy = angular.copy( $scope.scheduleModel );
-    $scope.saveable = miqService.saveable;
 
     ManageIQ.angularApplication.$scope = $scope;
 

diff --git a/app/views/layouts/angular/_form_buttons_verify_angular.html.haml b/app/views/layouts/angular/_form_buttons_verify_angular.html.haml
@@ -7,7 +7,7 @@
 - else
   - validate = "validateClicked('#{url_for(:action => validate_url, :id => id, :type => valtype, :button => "validate")}')"
 
-%div{'ng-show' => ng_show}
+%div{"ng-show" => ng_show, "ng-controller" => "buttonGroupController"}
   = button_tag("Validate",
                  :class     => "btn btn-primary btn-xs btn-disabled",
                  :alt       => "Validate",

diff --git a/app/views/layouts/angular/_x_edit_buttons_angular.html.haml b/app/views/layouts/angular/_x_edit_buttons_angular.html.haml
@@ -1,9 +1,9 @@
-.button-group
+.button-group{"ng-controller" => "buttonGroupController"}
   = button_tag("Add",
-               "class"    => "btn btn-primary btn-disabled",
+               "class"       => "btn btn-primary btn-disabled",
                :alt          => "Add",
                :title        => "Add",
-               "ng-click"    => "addClicked($event, false)",
+               "ng-click"    => "disabledClick($event)",
                "ng-show"     => "newRecord && !saveable(angularForm)")
 
   = button_tag("Add",
@@ -17,7 +17,7 @@
                :class        => "btn btn-primary btn-disabled",
                :alt          => "Save changes",
                :title        => "Save changes",
-               "ng-click"    => "saveClicked($event, false)",
+               "ng-click"    => "disabledClick($event)",
                "ng-show"     => "!newRecord && !saveable(angularForm)")
 
   = button_tag("Save",

diff --git a/spec/javascripts/controllers/buttons/button_group_controller_spec.js b/spec/javascripts/controllers/buttons/button_group_controller_spec.js
@@ -0,0 +1,30 @@
+describe('buttonGroupController', function() {
+  var $scope, $controller, $httpBackend, miqService;
+
+  beforeEach(module('ManageIQ.angularApplication'));
+
+  beforeEach(inject(function(_$httpBackend_, $rootScope, _$controller_, _miqService_) {
+    miqService = _miqService_;
+    $scope = $rootScope.$new();
+    $httpBackend = _$httpBackend_;
+    $controller = _$controller_('buttonGroupController',
+      {$http: $httpBackend, $scope: $scope, miqService: miqService});
+  }));
+
+  afterEach(function() {
+    $httpBackend.verifyNoOutstandingExpectation();
+    $httpBackend.verifyNoOutstandingRequest();
+  });
+
+  describe('saveable should exist in the scope', function() {
+    it('returns true', function() {
+      expect($scope.saveable).toBeDefined();
+    });
+  });
+
+  describe('disabledClick should exist in the scope', function() {
+    it('returns true', function() {
+      expect($scope.disabledClick).toBeDefined();
+    });
+  });
+});
diff --git a/spec/javascripts/controllers/ems_common/ems_common_form_controller_spec.js b/spec/javascripts/controllers/ems_common/ems_common_form_controller_spec.js
@@ -338,15 +338,6 @@ describe('emsCommonFormController', function() {
     });
   });
 
-  describe('saveable should exist in the scope', function() {
-    beforeEach(function() {
-      $httpBackend.flush();
-    });
-    it('returns true', function() {
-      expect($scope.saveable).toBeDefined();
-    });
-  });
-
   describe('Validates credential fields', function() {
     beforeEach(function() {
       $httpBackend.flush();

diff --git a/spec/javascripts/controllers/host/host_form_controller_spec.js b/spec/javascripts/controllers/host/host_form_controller_spec.js
@@ -162,12 +162,6 @@ describe('hostFormController', function() {
     });
   });
 
-  describe('saveable should exist in the scope', function() {
-    it('returns true', function() {
-      expect($scope.saveable).toBeDefined();
-    });
-  });
-
   describe('Validates credential fields', function() {
     beforeEach(inject(function($compile, miqService) {
       var angularForm;

diff --git a/spec/javascripts/controllers/schedule/schedule_form_controller_spec.js b/spec/javascripts/controllers/schedule/schedule_form_controller_spec.js
@@ -716,12 +716,6 @@ describe('scheduleFormController', function() {
     });
   });
 
-  describe('saveable should exist in the scope', function() {
-    it('returns true', function() {
-      expect($scope.saveable).toBeDefined();
-    });
-  });
-
   describe('Validates credential fields', function() {
     beforeEach(inject(function($compile, miqService) {
       var angularForm;

diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
@@ -29,6 +29,7 @@ src_files:
   - javascripts/controllers/schedule/schedule_form_controller.js
   - javascripts/controllers/repository/repository_form_controller.js
   - javascripts/controllers/retirement/retirement_form_controller.js
+  - javascripts/controllers/buttons/button_group_controller.js
   - javascripts/directives/autofocus.js
   - javascripts/directives/repository/valid_unc_path.js
   - javascripts/directives/checkchange.js