diff --git a/awx/ui/static/js/controllers/Home.js b/awx/ui/static/js/controllers/Home.js index 90f37d786a..00814feac7 100644 --- a/awx/ui/static/js/controllers/Home.js +++ b/awx/ui/static/js/controllers/Home.js @@ -30,8 +30,7 @@ function Home ($scope, $compile, $routeParams, $rootScope, $location, Wait, Obje stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }; var html = Button({ btn: buttons.refresh, action: 'refresh', toolbar: true }); @@ -136,15 +135,11 @@ function HomeGroups ($location, $routeParams, HomeGroupList, GenerateList, Proce scope['home_groups'][i].show_failures = hosts_status['failures'], scope['home_groups'][i].hosts_status_class = hosts_status['class'], - //scope.home_groups[i].failed_hosts_tip = msg['tooltip']; - //scope.home_groups[i].failed_hosts_link = msg['url']; - //scope.home_groups[i].failed_hosts_class = msg['class']; + scope.home_groups[i].status = scope.home_groups[i].summary_fields.inventory_source.status; scope.home_groups[i].source = (scope.home_groups[i].summary_fields.inventory_source) ? scope.home_groups[i].summary_fields.inventory_source.source : null; - //scope.home_groups[i].last_updated = last_update; - //scope.home_groups[i].status_badge_class = update_status['class']; - //scope.home_groups[i].status_badge_tooltip = update_status['tooltip']; + } }); diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js index eeb18c95bd..eef3a5be53 100644 --- a/awx/ui/static/js/forms/Credentials.js +++ b/awx/ui/static/js/forms/Credentials.js @@ -19,8 +19,7 @@ angular.module('CredentialFormDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'edit', - ngShow: "user_is_superuser" + mode: 'edit' } }, diff --git a/awx/ui/static/js/forms/Groups.js b/awx/ui/static/js/forms/Groups.js index fd912a1de2..4976ef0410 100644 --- a/awx/ui/static/js/forms/Groups.js +++ b/awx/ui/static/js/forms/Groups.js @@ -127,21 +127,6 @@ angular.module('GroupFormDefinition', []) dataContainer: 'body', tab: 'source' }, - /*update_interval: { - label: 'Update Interval', - type: 'select', - ngOptions: 'interval.label for interval in update_interval_options', - ngShow: "source.value !== '' && source.value !== null", - editRequired: false, - addRequired: false, - 'default': { label: 'none', value: 0 }, - dataTitle: 'Update Interval', - dataPlacement: 'left', - awPopOver: "

Automatically run the inventory update process the selected number of minutes from " + - "the last run.

With a value set, task manager will periodically compare the amount of elapsed time from the last run. If enough time " + - "has elapsed, it will go ahead and start an inventory update process.

", - dataContainer: 'body' - },*/ checkbox_group: { label: 'Update Options', type: 'checkbox_group', diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js index d30e52b9a6..8a4538f99c 100644 --- a/awx/ui/static/js/forms/Inventories.js +++ b/awx/ui/static/js/forms/Inventories.js @@ -23,8 +23,7 @@ angular.module('InventoryFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/InventoryHosts.js b/awx/ui/static/js/forms/InventoryHosts.js index e8d099a835..901b818e98 100644 --- a/awx/ui/static/js/forms/InventoryHosts.js +++ b/awx/ui/static/js/forms/InventoryHosts.js @@ -112,8 +112,7 @@ angular.module('InventoryHostsFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js index bfb87cf176..6bffeb246b 100644 --- a/awx/ui/static/js/forms/JobTemplates.js +++ b/awx/ui/static/js/forms/JobTemplates.js @@ -24,8 +24,7 @@ angular.module('JobTemplateFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/Organizations.js b/awx/ui/static/js/forms/Organizations.js index d5e66a5141..3992a0938b 100644 --- a/awx/ui/static/js/forms/Organizations.js +++ b/awx/ui/static/js/forms/Organizations.js @@ -23,8 +23,7 @@ angular.module('OrganizationFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/Permissions.js b/awx/ui/static/js/forms/Permissions.js index b23d98d571..289aa345b5 100644 --- a/awx/ui/static/js/forms/Permissions.js +++ b/awx/ui/static/js/forms/Permissions.js @@ -24,8 +24,7 @@ angular.module('PermissionFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' }, fields: { diff --git a/awx/ui/static/js/forms/Projects.js b/awx/ui/static/js/forms/Projects.js index 3727c46ed6..0fadf0a84e 100644 --- a/awx/ui/static/js/forms/Projects.js +++ b/awx/ui/static/js/forms/Projects.js @@ -25,8 +25,7 @@ angular.module('ProjectFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/Teams.js b/awx/ui/static/js/forms/Teams.js index 129ca6601a..b1329c330c 100644 --- a/awx/ui/static/js/forms/Teams.js +++ b/awx/ui/static/js/forms/Teams.js @@ -27,8 +27,7 @@ angular.module('TeamFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js index 0b014366b6..13e16da6e9 100644 --- a/awx/ui/static/js/forms/Users.js +++ b/awx/ui/static/js/forms/Users.js @@ -24,8 +24,7 @@ angular.module('UserFormDefinition', []) dataPlacement: "top", icon: "icon-comments-alt", mode: 'edit', - iconSize: 'large', - ngShow: "user_is_superuser" + iconSize: 'large' } }, diff --git a/awx/ui/static/js/helpers/Access.js b/awx/ui/static/js/helpers/Access.js index 2c3d00bf29..1992004fec 100644 --- a/awx/ui/static/js/helpers/Access.js +++ b/awx/ui/static/js/helpers/Access.js @@ -64,14 +64,14 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies']) status = 'alert-danger'; hdr = 'License Error'; msg = '

There is a problem with the /etc/awx/license file on your Tower server. Check to make sure Tower can access ' + - 'the file.

' + purchase_msg; + 'the file.

' + purchase_msg; Alert(hdr, msg, status, null, false, true); } else if (license['demo'] !== undefined && license['demo'] == true) { // demo status = 'alert-info'; hdr = 'Tower Demo'; - msg = '

Thank you for trying Ansible Tower. You can use this edition to manage up to 10 hosts free.

' + + msg = '

Thank you for trying Ansible Tower. You can use this edition to manage up to 10 hosts free.

' + purchase_msg; Alert(hdr, msg, status); } @@ -80,7 +80,7 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies']) status = 'alert-info'; hdr = 'License Expired'; msg = '

Your Ansible Tower License has expired and is no longer compliant. You can continue, but you will be ' + - 'unable to add any additional hosts.

' + purchase_msg; + 'unable to add any additional hosts.

' + purchase_msg; Alert(hdr, msg, status); } else if (license['date_warning'] !== undefined && license['date_warning'] == true) { diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js index 791af2d854..fd553d5dcd 100644 --- a/awx/ui/static/js/lists/Credentials.js +++ b/awx/ui/static/js/lists/Credentials.js @@ -62,8 +62,7 @@ angular.module('CredentialsListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/HomeGroups.js b/awx/ui/static/js/lists/HomeGroups.js index c3121c1109..0855150131 100644 --- a/awx/ui/static/js/lists/HomeGroups.js +++ b/awx/ui/static/js/lists/HomeGroups.js @@ -32,46 +32,6 @@ angular.module('HomeGroupListDefinition', []) columnClass: 'col-lg-3 col-md2 col-sm-2 hidden-xs elllipsis', linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}" }, - /*failed_hosts: { - label: 'Failed Hosts', - ngHref: "\{\{ group.failed_hosts_link \}\}", - badgeIcon: "\{\{ 'fa icon-failures-' + group.failed_hosts_class \}\}", - badgeNgHref: "\{\{ group.failed_hosts_link \}\}", - badgePlacement: 'left', - badgeToolTip: "\{\{ group.failed_hosts_tip \}\}", - badgeTipPlacement: 'top', - awToolTip: "\{\{ group.failed_hosts_tip \}\}", - dataPlacement: "top", - searchable: false, - excludeModal: true, - sortField: "hosts_with_active_failures" - },*/ - /*status: { - label: 'Status', - ngClick: "viewUpdateStatus(\{\{ group.id \}\})", - searchType: 'select', - badgeIcon: "\{\{ 'fa fa-cloud ' + group.status_badge_class \}\}", - badgeToolTip: "\{\{ group.status_badge_tooltip \}\}", - awToolTip: "\{\{ group.status_badge_tooltip \}\}", - dataPlacement: 'top', - badgeTipPlacement: 'top', - badgePlacement: 'left', - searchOptions: [ - { name: "failed", value: "failed" }, - { name: "never", value: "never updated" }, - { name: "n/a", value: "none" }, - { name: "successful", value: "successful" }, - { name: "updating", value: "updating" }], - sourceModel: 'inventory_source', - sourceField: 'status' - },*/ - /*last_updated: { - label: 'Last
Updated', - sourceModel: 'inventory_source', - sourceField: 'last_updated', - searchable: false, - nosort: false - },*/ source: { label: 'Source', searchType: 'select', @@ -164,8 +124,7 @@ angular.module('HomeGroupListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } } diff --git a/awx/ui/static/js/lists/HomeHosts.js b/awx/ui/static/js/lists/HomeHosts.js index 4f157ec69b..f9f5af421d 100644 --- a/awx/ui/static/js/lists/HomeHosts.js +++ b/awx/ui/static/js/lists/HomeHosts.js @@ -92,8 +92,7 @@ angular.module('HomeHostListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } } diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index d089c7194e..32860ea728 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -62,8 +62,7 @@ angular.module('InventoriesListDefinition', []) ngClick: "showActivity()", awToolTip: "View Activity Stream", icon: "icon-comments-alt", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, @@ -94,17 +93,5 @@ angular.module('InventoriesListDefinition', []) awToolTip: 'Delete inventory', dataPlacement: 'top' } - /*, - dropdown: { - type: 'DropDown', - label: 'Jobs', - icon: 'icon-zoom-in', - 'class': 'btn-default btn-xs', - options: [ - { ngClick: 'viewJobs(\{\{ inventory.id \}\})', label: 'All' }, - { ngClick: "viewFailedJobs(\{\{ inventory.id \}\})", label: 'Failed' } - ] - } - */ } }); diff --git a/awx/ui/static/js/lists/InventoryGroups.js b/awx/ui/static/js/lists/InventoryGroups.js index c5a2c9e76f..0e6a9602cd 100644 --- a/awx/ui/static/js/lists/InventoryGroups.js +++ b/awx/ui/static/js/lists/InventoryGroups.js @@ -59,8 +59,7 @@ angular.module('InventoryGroupsDefinition', []) stream: { ngClick: "showGroupActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' }, help: { mode: 'all', diff --git a/awx/ui/static/js/lists/InventoryHosts.js b/awx/ui/static/js/lists/InventoryHosts.js index 0eeb7204b4..65fdafad21 100644 --- a/awx/ui/static/js/lists/InventoryHosts.js +++ b/awx/ui/static/js/lists/InventoryHosts.js @@ -31,14 +31,6 @@ angular.module('InventoryHostsDefinition', []) dataType: "host", awDraggable: "true" }, - /*groups: { - label: 'Groups', - searchable: true, - sourceModel: 'groups', - sourceField: 'name', - nosort: true, - searchPlaceholder: "search_place_holder" - },*/ enabled: { label: 'Disabled?', searchSingleValue: true, @@ -100,8 +92,7 @@ angular.module('InventoryHostsDefinition', []) stream: { ngClick: "showHostActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } } diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js index b567203aea..a75addc293 100644 --- a/awx/ui/static/js/lists/JobTemplates.js +++ b/awx/ui/static/js/lists/JobTemplates.js @@ -39,8 +39,7 @@ angular.module('JobTemplatesListDefinition', []) ngClick: "showActivity()", awToolTip: "View Activity Stream", icon: "icon-comments-alt", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/Organizations.js b/awx/ui/static/js/lists/Organizations.js index 6eeaa7c55d..5bcd0b5f23 100644 --- a/awx/ui/static/js/lists/Organizations.js +++ b/awx/ui/static/js/lists/Organizations.js @@ -36,8 +36,7 @@ angular.module('OrganizationListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/Permissions.js b/awx/ui/static/js/lists/Permissions.js index a29c1f3680..d9d7fbc310 100644 --- a/awx/ui/static/js/lists/Permissions.js +++ b/awx/ui/static/js/lists/Permissions.js @@ -51,8 +51,7 @@ angular.module('PermissionListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 93bcb8682e..316ca9f4de 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -84,8 +84,7 @@ angular.module('ProjectsListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/Teams.js b/awx/ui/static/js/lists/Teams.js index acc886ecfd..55ffb044de 100644 --- a/awx/ui/static/js/lists/Teams.js +++ b/awx/ui/static/js/lists/Teams.js @@ -43,8 +43,7 @@ angular.module('TeamsListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } }, diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js index 7faee8a101..6e51aef831 100644 --- a/awx/ui/static/js/lists/Users.js +++ b/awx/ui/static/js/lists/Users.js @@ -45,8 +45,7 @@ angular.module('UserListDefinition', []) stream: { ngClick: "showActivity()", awToolTip: "View Activity Stream", - mode: 'all', - ngShow: "user_is_superuser" + mode: 'all' } },