Merge pull request #65 from mabashian/7294-group-circular-association

Show api errors when attempting circular association

awx/ui/client/src/app.js

@@ -206,7 +206,6 @@ var awApp = angular.module('awApp', [
             LoadConfig, Store, pendoService, Prompt, Rest, Wait,
             ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
             $filter, SocketService, AppStrings) {
-            console.log("This works fine!");
             $rootScope.$state = $state;
             $rootScope.$state.matches = function(stateName) {
                 return $state.current.name.search(stateName) > 0;

awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups-associate.route.js

@@ -26,7 +26,6 @@ export default {
     onExit: function($state) {
         if ($state.transition) {
             $('#associate-groups-modal').modal('hide');
-            $('.modal-backdrop').remove();
             $('body').removeClass('modal-open');
         }
     },

awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-associate.route.js

@@ -26,7 +26,6 @@ export default {
     onExit: function($state) {
         if ($state.transition) {
             $('#associate-groups-modal').modal('hide');
-            $('.modal-backdrop').remove();
             $('body').removeClass('modal-open');
         }
     },

awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-associate.route.js

@@ -26,7 +26,6 @@ export default {
     onExit: function($state) {
         if ($state.transition) {
             $('#associate-groups-modal').modal('hide');
-            $('.modal-backdrop').remove();
             $('body').removeClass('modal-open');
         }
     },

awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups-associate.route.js

@@ -26,7 +26,6 @@ export default {
     onExit: function($state) {
         if ($state.transition) {
             $('#associate-groups-modal').modal('hide');
-            $('.modal-backdrop').remove();
             $('body').removeClass('modal-open');
         }
     },

awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js

@@ -94,13 +94,8 @@
              $scope.saveFunction({selectedItems: $scope.selectedItems})
                  .then(() =>{
                      $scope.closeModal();
-                 }).catch((error) => {
+                 }).catch(() => {
                      $scope.closeModal();
-                     ProcessErrors(null, error.data, error.status, null, {
-                         hdr: 'Error!',
-                         msg: 'Failed to associate host to group(s): POST returned status' +
-                             error.status
-                     });
                  });
 
          };

awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js

@@ -93,13 +93,8 @@
              $scope.saveFunction({selectedItems: $scope.selectedItems})
                  .then(() =>{
                      $scope.closeModal();
-                 }).catch((error) => {
+                 }).catch(() => {
                      $scope.closeModal();
-                     ProcessErrors(null, error.data, error.status, null, {
-                         hdr: 'Error!',
-                         msg: 'Failed to associate host to host(s): POST returned status' +
-                             error.status
-                     });
                  });
 
          };