From ae64b9abac638756c6b8ded85a87d78879d68627 Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Fri, 6 Jul 2018 15:32:53 -0400 Subject: [PATCH] Remove calendar icon and related code from lists --- awx/ui/client/features/output/_index.less | 2 +- .../inventories/inventory.list.js | 14 +++++++------- .../sources/list/sources-list.controller.js | 7 +------ .../inventories/related/sources/sources.list.js | 8 -------- .../organizations-job-templates.controller.js | 4 ---- .../organizations-projects.controller.js | 9 --------- .../src/projects/list/projects-list.controller.js | 9 --------- awx/ui/client/src/projects/projects.list.js | 8 -------- awx/ui/client/src/templates/templates.list.js | 7 ------- 9 files changed, 9 insertions(+), 59 deletions(-) diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less index 89c09dc451..67224f387a 100644 --- a/awx/ui/client/features/output/_index.less +++ b/awx/ui/client/features/output/_index.less @@ -149,10 +149,10 @@ flex: 1; font-family: monospace; font-size: 15px; + height: 100%; margin: 0; overflow-y: scroll; padding: 0; - height: 100%; } &-borderHeader { diff --git a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js index 8d6b8b7219..c9fdb09755 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js @@ -101,13 +101,6 @@ export default ['i18n', 'awxNetStrings' , function(i18n, awxNetStrings) { dataPlacement: 'top', ngShow: '!inventory.pending_deletion && inventory.summary_fields.user_capabilities.edit' }, - network: { - label: awxNetStrings.get('feature.ACTION_BUTTON'), - ngClick: 'goToGraph(inventory)', - awToolTip: awxNetStrings.get('feature.ACTION_BUTTON'), - dataPlacement: 'top', - ngShow: '!inventory.pending_deletion' - }, copy: { label: i18n._('Copy'), ngClick: 'copyInventory(inventory)', @@ -123,6 +116,13 @@ export default ['i18n', 'awxNetStrings' , function(i18n, awxNetStrings) { dataPlacement: 'top', ngShow: '!inventory.summary_fields.user_capabilities.edit' }, + network: { + label: awxNetStrings.get('feature.ACTION_BUTTON'), + ngClick: 'goToGraph(inventory)', + awToolTip: awxNetStrings.get('feature.ACTION_BUTTON'), + dataPlacement: 'top', + ngShow: '!inventory.pending_deletion' + }, "delete": { label: i18n._('Delete'), ngClick: "deleteInventory(inventory.id, inventory.name)", diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js index 6b2d43ee55..1a9f96bbe3 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js @@ -108,7 +108,6 @@ {status_tooltip: inventory_source_status.tooltip}, {launch_tooltip: inventory_source_status.launch_tip}, {launch_class: inventory_source_status.launch_class}, - {group_schedule_tooltip: inventory_source_status.schedule_tip}, {source: inventory_source ? inventory_source.source : null}, {status: inventory_source ? inventory_source.status : null}); } @@ -213,17 +212,13 @@ $scope.cancelUpdate = function (id) { CancelSourceUpdate({ scope: $scope, id: id }); }; + $scope.viewUpdateStatus = function (id) { ViewUpdateStatus({ scope: $scope, inventory_source_id: id }); }; - $scope.scheduleSource = function(id) { - // Add this inv source's id to the array of inv source id's so that it gets - // added to the breadcrumb trail - $state.go('inventories.edit.inventory_sources.edit.schedules',{inventory_source_id: id}); - }; $scope.syncAllSources = function() { InventoryUpdate({ diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js index 8fdf58bec2..21df43f7df 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js @@ -104,14 +104,6 @@ dataPlacement: "top", iconClass: "fa fa-minus-circle" }, - schedule: { - mode: 'all', - ngClick: "scheduleSource(inventory_source.id)", - awToolTip: "{{ inventory_source.group_schedule_tooltip }}", - ngClass: "inventory_source.scm_type_class", - dataPlacement: 'top', - ngShow: "!(inventory_source.summary_fields.inventory_source.source === '') && inventory_source.summary_fields.user_capabilities.schedule" - }, view: { mode: 'all', ngClick: "editSource(inventory_source.id)", diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js index 67003502ce..d01049ed21 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js @@ -72,9 +72,5 @@ export default ['$scope', '$rootScope', $scope.editJobTemplate = function(id) { $state.go('templates.editJobTemplate', { job_template_id: id }); }; - - $scope.scheduleJob = function(id) { - $state.go('templates.editJobTemplate.schedules', { id: id }); - }; } ]; diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js index 48a59a967d..a12108c366 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js @@ -36,7 +36,6 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', $scope.projects[i].statusIcon = GetProjectIcon(project.status); $scope.projects[i].statusTip = GetProjectToolTip(project.status); $scope.projects[i].scm_update_tooltip = "Get latest SCM revision"; - $scope.projects[i].scm_schedule_tooltip = "Schedule SCM revision updates"; $scope.projects[i].scm_type_class = ""; if (project.status === 'failed' && project.summary_fields.last_update && project.summary_fields.last_update.status === 'canceled') { @@ -53,7 +52,6 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', $scope.projects[i].scm_type = type.label; if (type.label === 'Manual') { $scope.projects[i].scm_update_tooltip = 'Manual projects do not require an SCM update'; - $scope.projects[i].scm_schedule_tooltip = 'Manual projects do not require a schedule'; $scope.projects[i].scm_type_class = 'btn-disabled'; $scope.projects[i].statusTip = 'Not configured for SCM'; $scope.projects[i].statusIcon = 'none'; @@ -298,13 +296,6 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert', }); }; - $scope.editSchedules = function(id) { - var project = Find({ list: $scope.projects, key: 'id', val: id }); - if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) { - $state.go('projects.edit.schedules', { project_id: id }); - } - }; - $scope.formCancel = function() { $state.go('organizations'); }; diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index 6208a7c553..79adc91b41 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -74,7 +74,6 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', project.statusIcon = GetProjectIcon(project.status); project.statusTip = GetProjectToolTip(project.status); project.scm_update_tooltip = i18n._("Get latest SCM revision"); - project.scm_schedule_tooltip = i18n._("Schedule SCM revision updates"); project.scm_type_class = ""; if (project.status === 'failed' && project.summary_fields.last_update && project.summary_fields.last_update.status === 'canceled') { @@ -88,7 +87,6 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', } if (project.scm_type === 'manual') { project.scm_update_tooltip = i18n._('Manual projects do not require an SCM update'); - project.scm_schedule_tooltip = i18n._('Manual projects do not require a schedule'); project.scm_type_class = 'btn-disabled'; project.statusTip = i18n._('Not configured for SCM'); project.statusIcon = 'none'; @@ -328,12 +326,5 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', } }); }; - - $scope.editSchedules = function(id) { - var project = Find({ list: $scope.projects, key: 'id', val: id }); - if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) { - $state.go('projects.edit.schedules', { project_id: id }); - } - }; } ]; diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js index 86547c8b66..64b0ddb4ab 100644 --- a/awx/ui/client/src/projects/projects.list.js +++ b/awx/ui/client/src/projects/projects.list.js @@ -96,14 +96,6 @@ export default ['i18n', function(i18n) { dataPlacement: 'top', ngShow: "project.summary_fields.user_capabilities.start" }, - schedule: { - mode: 'all', - ngClick: "editSchedules(project.id)", - awToolTip: "{{ project.scm_schedule_tooltip }}", - ngClass: "project.scm_type_class", - dataPlacement: 'top', - ngShow: "project.summary_fields.user_capabilities.schedule" - }, copy: { label: i18n._('Copy'), ngClick: 'copyProject(project)', diff --git a/awx/ui/client/src/templates/templates.list.js b/awx/ui/client/src/templates/templates.list.js index e45a1fa5ba..b2c82634c2 100644 --- a/awx/ui/client/src/templates/templates.list.js +++ b/awx/ui/client/src/templates/templates.list.js @@ -89,13 +89,6 @@ export default ['i18n', function(i18n) { // The submit key lets the list generator know that we want to use the // at-launch-template directive }, - schedule: { - label: i18n._('Schedule'), - mode: 'all', - ngClick: 'scheduleJob(template)', - awToolTip: i18n._('Schedule job template runs'), - dataPlacement: 'top', - }, copy: { label: i18n._('Copy'), ngClick: 'copyTemplate(template)',