From f8194143373284915894a15d960d10dfd6215513 Mon Sep 17 00:00:00 2001 From: Samir Jha Date: Tue, 28 Jan 2025 14:43:19 +0000 Subject: [PATCH] Refs #38162 - Fix invalid self-closing tags --- .../common/views/subscription-add-or-remove.html | 2 +- .../bulk/views/content-hosts-bulk-errata-modal.html | 4 ++-- .../views/content-hosts-bulk-subscriptions-modal.html | 4 ++-- .../content-hosts/content/views/content-host-errata.html | 2 +- .../content-hosts/details/views/content-host-info.html | 4 ++-- .../details/views/content-host-provisioning-info.html | 2 +- .../content-hosts/views/content-hosts.html | 4 ++-- .../details/views/environment-content-views.html | 2 +- .../environments/details/views/environment-errata.html | 2 +- .../bastion_katello/errata/views/errata-tasks-list.html | 3 ++- .../packages/details/views/package-info.html | 2 +- .../bulk/views/products-bulk-sync-plan-modal.html | 4 ++-- .../repositories/details/views/repository-info.html | 8 ++++---- .../repositories/details/views/repository-tasks.html | 3 ++- .../products/details/views/product-info.html | 6 +++--- .../products/details/views/product-tasks.html | 3 ++- .../products/discovery/views/discovery-create.html | 6 ++++-- .../products/discovery/views/discovery.html | 3 ++- .../views/partials/product-table-sync-status.html | 2 +- .../subscriptions/views/subscription-start-date.html | 2 +- .../sync-plans/details/views/sync-plan-info.html | 2 +- .../bastion_katello/sync-plans/views/sync-plans.html | 4 ++-- .../bastion_katello/tasks/tasks-table.directive.js | 3 ++- .../bastion_katello/tasks/views/task-details.html | 4 ++-- .../bastion_katello/tasks/views/tasks-index.html | 2 +- .../bastion_katello/tasks/views/tasks-table.html | 2 +- .../bastion_katello/tasks/views/user-tasks-table.html | 2 +- 27 files changed, 47 insertions(+), 40 deletions(-) diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html index e801695127d..4d64e5a15af 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html @@ -40,7 +40,7 @@
- + {{ subscription.support_level }} {{ subscription.contract_number }} {{ subscription.account_number }} diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html index 2649837455b..8d69fe0cee6 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html @@ -102,11 +102,11 @@

Content Host Errata Management

{{ erratum.affected_hosts_count }} - + {{ erratum.affected_hosts_count }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html index c2ce03adb48..5042efe4e99 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html @@ -16,7 +16,7 @@

-

+

@@ -106,7 +106,7 @@

{{ subscription | subscriptionConsumedFilter }}
- + {{ subscription.support_level }} {{ subscription.contract_number }} {{ subscription.account_number }} diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html index c9b4d7a461d..3873bf5bf04 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html @@ -136,7 +136,7 @@

Installable Errata {{ erratum.title }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html index 5b85b88f4e4..be0cfbbc8a5 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html @@ -278,7 +278,7 @@

Content Host Status

Registered
-
+
Registered By
@@ -305,7 +305,7 @@

Content Host Status

Last Checkin
-
+
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html index c44ac689ebe..362a619a683 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html @@ -25,7 +25,7 @@

Provisioning Host Details

{{ host.puppet_environment_name }}
Last Puppet Report
-
+
Model
{{ host.model_name }}
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html index 113b2daa7f8..b2fa7ad6103 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html @@ -139,8 +139,8 @@

Content Hosts

{{ host.operatingsystem_name }} {{ host.content_facet_attributes.lifecycle_environment.name }} {{ host.content_facet_attributes.content_view.name || "" }} - - + + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html index d8b4597b98a..1673aff61fe 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html @@ -28,7 +28,7 @@ Yes No - + {{ contentView.repositories.length || 0 }} diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html index d9289d1d320..646b1b3db1b 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html @@ -46,7 +46,7 @@ {{ errata.hosts_available_count || 0 }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html index 928bd722457..922a290f5f5 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html @@ -2,4 +2,5 @@

Errata Task List

+ resource-id="{{ errara.id }}"> +
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html index fbff73e3e9b..bbfb52bca13 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html @@ -88,7 +88,7 @@

Build Information

{{ package.buildhost }}
Build Time
-
+

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html index aa7131b23f5..4a3651e9058 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html @@ -68,10 +68,10 @@

Sync Plan Management

{{ syncPlan.name }} - + {{ syncPlan.enabled }} {{ syncPlan.interval | translate | capitalize }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html index f804ab6a625..43226177d57 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html @@ -400,13 +400,13 @@

Sync Status

Not Synced
- - ( Local Time) + + ( Local Time)
Next Sync
- (Server Time) + (Server Time)
Synced manually, no interval set. @@ -537,7 +537,7 @@

Content Counts

-
+
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-tasks.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-tasks.html index 5b728d89747..176bbeee4bd 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-tasks.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-tasks.html @@ -1,4 +1,5 @@
+ resource-id="{{ repository.id }}"> +
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html index 41ba3e5940b..c5c29dab09d 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html @@ -88,13 +88,13 @@

Sync Status

Last Sync
- - ( Local Time) + + ( Local Time)
Next Sync
- (Server Time) + (Server Time)
Synced manually, no interval set. diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-tasks.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-tasks.html index cbebcf09f79..47ff4935e87 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-tasks.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-tasks.html @@ -1,4 +1,5 @@
+ resource-id="{{ product.id }}"> +
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html index cc91eb81192..9ae559bca99 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html @@ -16,7 +16,8 @@

Product Options

Product Options

Repository Options

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html index e55c22fb171..46107ef84d7 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html @@ -4,7 +4,8 @@
Last synced - . + .
{{ checkFutureDate(subscription.start_date) }} +{{ checkFutureDate(subscription.start_date) }} diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html index cb07d1e7b75..6d522a4646d 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html @@ -42,7 +42,7 @@

Basic Information

Next Sync
-
+
Recurring Logic
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html index ee35ff62480..7ef3af5df04 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html @@ -43,10 +43,10 @@

Sync Plans

{{ syncPlan.description }} - + {{ syncPlan.enabled }} {{ syncPlan.interval | translate | capitalize }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js index 47d3e4f34ae..3161188c4f4 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js @@ -26,7 +26,8 @@
+ resource-id="{{ product.id }}"> + */ angular.module('Bastion.tasks').directive('tasksTable', diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html index 19d697485f6..acb9b738d36 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html @@ -8,10 +8,10 @@

Task Details

{{ task.username }}
Started At
-
+
Finished At
-
+
Parameters
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-index.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-index.html index 7dcef375051..8f208b89ec2 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-index.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-index.html @@ -1 +1 @@ -
+
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html index 4f83a198f9f..77e5753c84b 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html @@ -32,7 +32,7 @@ {{ task.username }} - + diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html index b49dabe0a74..24f850eb128 100644 --- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html +++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html @@ -22,7 +22,7 @@ {{ task.humanized.input | taskInputShort | taskInputCompile }} - +