From 5e22c86c452ece64ea52a6d2f5b16c8e3e37c3cc Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Thu, 12 Mar 2015 14:32:41 -0400
Subject: [PATCH] link to manage page from inv list

---
 awx/ui/static/js/controllers/Inventories.js  | 10 +++++-----
 awx/ui/static/js/forms/Inventories.js        |  9 ---------
 awx/ui/static/js/lists/Inventories.js        | 15 +--------------
 awx/ui/static/js/lists/InventoryGroups.js    | 10 +++++-----
 awx/ui/static/js/shared/generator-helpers.js |  5 +----
 awx/ui/static/partials/inventory-manage.html |  2 +-
 6 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js
index 1911fbdb0d..2e45d00c5c 100644
--- a/awx/ui/static/js/controllers/Inventories.js
+++ b/awx/ui/static/js/controllers/Inventories.js
@@ -730,11 +730,11 @@ export function InventoriesManage ($log, $scope, $location, $routeParams, $compi
     $scope.removeInventoryLoaded = $scope.$on('InventoryLoaded', function() {
         var e, rows;
 
-        LoadBreadCrumbs();
-        //     path: $location.path(),
-        //     title: 'All Groups'//'{{ inventory.name }}'
-        // });
-        $scope.group_breadcrumbs[0].name = "All Groups"; // $scope.inventory.name;
+        LoadBreadCrumbs({
+            path: $location.path(),
+            title: '{{ inventory.name }}'
+        });
+        $scope.group_breadcrumbs[0].name = $scope.inventory.name;
 
         // Build page breadcrumbs
         e = angular.element(document.getElementById('breadcrumbs'));
diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js
index b6c598b819..b5a9fca1f3 100644
--- a/awx/ui/static/js/forms/Inventories.js
+++ b/awx/ui/static/js/forms/Inventories.js
@@ -22,15 +22,6 @@ export default
             well: true,
 
             actions: {
-                manage: {
-                    'class': "btn-primary btn-xs activity-btn",
-                    ngClick: "manageInventory()",
-                    awToolTip: "Manage Inventory",
-                    dataPlacement: "top",
-                    icon: "icon-sitemap",
-                    mode: 'edit',
-                    iconSize: 'large'
-                },
                 stream: {
                     'class': "btn-primary btn-xs activity-btn",
                     ngClick: "showActivity()",
diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js
index 012d0bc701..6fc95a4b50 100644
--- a/awx/ui/static/js/lists/Inventories.js
+++ b/awx/ui/static/js/lists/Inventories.js
@@ -49,7 +49,7 @@ export default
                 label: 'Name',
                 columnClass: 'col-md-4 col-sm-6 col-xs-6',
                 modalColumnClass: 'col-md-8',
-                linkTo: '/#/inventories/{{inventory.id}}'
+                linkTo: '/#/inventories/{{inventory.id}}/manage'
             },
             organization: {
                 label: 'Organization',
@@ -97,19 +97,6 @@ export default
         },
 
         fieldActions: {
-            // failed_hosts: {
-            //     //label: 'Failures',
-            //     ngHref: "{{ inventory.failed_hosts_link }}",
-            //     iconClass: "{{ 'fa icon-failures-' + inventory.failed_hosts_class }}",
-            //     awToolTip: "{{ inventory.failed_hosts_tip }}",
-            //     dataPlacement: "top"
-            // },
-            manage: {
-              label: 'Manage',
-              ngClick: 'manageInventory(inventory.id)',
-              awToolTip: 'Manage Inventory',
-              dataPlacement: 'top'
-            },
             edit: {
                 label: 'Edit',
                 ngClick: 'editInventory(inventory.id)', //'editInventoryProperties(inventory.id)',
diff --git a/awx/ui/static/js/lists/InventoryGroups.js b/awx/ui/static/js/lists/InventoryGroups.js
index 99cea4e5c7..ef88713e4d 100644
--- a/awx/ui/static/js/lists/InventoryGroups.js
+++ b/awx/ui/static/js/lists/InventoryGroups.js
@@ -83,11 +83,11 @@ export default
                 ngClick: "createGroup()",
                 awToolTip: "Create a new group"
             },
-            // properties: {
-            //     mode: 'all',
-            //     awToolTip: "Edit inventory properties",
-            //     ngClick: 'editInventoryProperties()'
-            // },
+            properties: {
+                mode: 'all',
+                awToolTip: "Edit inventory properties",
+                ngClick: 'editInventoryProperties()'
+            },
             refresh: {
                 mode: 'all',
                 awToolTip: "Refresh the page",
diff --git a/awx/ui/static/js/shared/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js
index d33c5dc6e2..9ed657e46f 100644
--- a/awx/ui/static/js/shared/generator-helpers.js
+++ b/awx/ui/static/js/shared/generator-helpers.js
@@ -136,7 +136,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                 icon = 'fa-check-square-o';
                 break;
             case 'properties':
-                icon = "fa-wrench";
+                icon = "fa-pencil";
                 break;
             case 'reset':
                 icon = "fa-undo";
@@ -162,9 +162,6 @@ angular.module('GeneratorHelpers', [systemStatus.name])
             case 'copy':
                 icon = "fa-copy";
                 break;
-            case 'manage':
-                icon = "fa-sitemap";
-                break;
             }
             icon += (size) ? " " + size : "";
             return Icon(icon);
diff --git a/awx/ui/static/partials/inventory-manage.html b/awx/ui/static/partials/inventory-manage.html
index 54840e4562..0ec23f3107 100644
--- a/awx/ui/static/partials/inventory-manage.html
+++ b/awx/ui/static/partials/inventory-manage.html
@@ -3,7 +3,7 @@
 
         <ul class="ansible-breadcrumb" id="#breadcrumbs">
             <li><a href="#/inventories">Inventories</a></li>
-            <li><a href = "#/inventories/{{inventory.id}}">{{inventory.name}}</a><li>
+            <!-- <li><a href = "#/inventories/{{inventory.id}}">{{inventory.name}}</a><li> -->
             <li ng-repeat="group_breadcrumb in group_breadcrumbs" ng-class="group_breadcrumb.active_class"><a href="" ng-click="breadcrumbGroupSelect(group_breadcrumb.id)">{{ group_breadcrumb.name }}</a></li>
         </ul>