From 367943fa3c0a9afa00bc2634bf82a4763831c2c8 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 20 Mar 2017 11:37:09 -0400
Subject: [PATCH] fix org list

---
 .../src/organizations/organizations.list.js   | 104 +++++++++---------
 awx/ui/client/src/shared/directives.js        |   3 -
 2 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/awx/ui/client/src/organizations/organizations.list.js b/awx/ui/client/src/organizations/organizations.list.js
index 3c763069ed..410a98293e 100644
--- a/awx/ui/client/src/organizations/organizations.list.js
+++ b/awx/ui/client/src/organizations/organizations.list.js
@@ -6,61 +6,59 @@
 
 
 export default [function() {
-    return function() {
-        return {
-            name: 'organizations',
-            iterator: 'organization',
-            selectTitle: 'Add Organizations',
-            selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
-                'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
-                '<i class=\"fa fa-plus\"></i> button.</p>',
-            editTitle: 'Organizations',
-            hover: true,
-            index: false,
+    return {
+        name: 'organizations',
+        iterator: 'organization',
+        selectTitle: 'Add Organizations',
+        selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
+            'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
+            '<i class=\"fa fa-plus\"></i> button.</p>',
+        editTitle: 'Organizations',
+        hover: true,
+        index: false,
 
-            fields: {
-                name: {
-                    key: true,
-                    label: 'Name',
-                    columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8'
-                },
-                description: {
-                    label: 'Description',
-                    columnClass: 'hidden-sm hidden-xs',
-                    excludeModal: true
-                }
+        fields: {
+            name: {
+                key: true,
+                label: 'Name',
+                columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8'
             },
-
-            actions: {
-                add: {
-                    mode: 'all', // One of: edit, select, all
-                    ngClick: 'addOrganization()',
-                    awToolTip: 'Create a new organization',
-                    awFeature: 'multiple_organizations',
-                    actionClass: 'btn List-buttonSubmit',
-                    buttonContent: '&#43; ADD'
-                }
-            },
-
-            fieldActions: {
-                edit: {
-                    label: 'Edit',
-                    ngClick: "editOrganization(organization.id)",
-                    icon: 'icon-edit',
-                    "class": 'btn-xs btn-default',
-                    awToolTip: 'Edit organization',
-                    dataPlacement: 'top'
-                },
-
-                "delete": {
-                    label: 'Delete',
-                    ngClick: "deleteOrganization(organization.id, organization.name)",
-                    icon: 'icon-trash',
-                    "class": 'btn-xs btn-danger',
-                    awToolTip: 'Delete organization',
-                    dataPlacement: 'top'
-                }
+            description: {
+                label: 'Description',
+                columnClass: 'hidden-sm hidden-xs',
+                excludeModal: true
             }
-        };
+        },
+
+        actions: {
+            add: {
+                mode: 'all', // One of: edit, select, all
+                ngClick: 'addOrganization()',
+                awToolTip: 'Create a new organization',
+                awFeature: 'multiple_organizations',
+                actionClass: 'btn List-buttonSubmit',
+                buttonContent: '&#43; ADD'
+            }
+        },
+
+        fieldActions: {
+            edit: {
+                label: 'Edit',
+                ngClick: "editOrganization(organization.id)",
+                icon: 'icon-edit',
+                "class": 'btn-xs btn-default',
+                awToolTip: 'Edit organization',
+                dataPlacement: 'top'
+            },
+
+            "delete": {
+                label: 'Delete',
+                ngClick: "deleteOrganization(organization.id, organization.name)",
+                icon: 'icon-trash',
+                "class": 'btn-xs btn-danger',
+                awToolTip: 'Delete organization',
+                dataPlacement: 'top'
+            }
+        }
     };
 }];
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 88b491527a..bdd9dc2462 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -745,9 +745,6 @@ function(ConfigurationUtils, i18n, $rootScope) {
 .directive('awToolTip', [function() {
     return {
         link: function(scope, element, attrs) {
-            // if (attrs.class.indexOf("JobResultsStdOut") > -1) {
-            //     debugger;
-            // }
             var delay = { show: 200, hide: 0 },
                 placement,
                 stateChangeWatcher;