Skip to content

Commit

Permalink
Fixes #37483 - Fix CV/LCE display in a couple angular places (Katello…
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylenz authored Jun 13, 2024
1 parent d39fb36 commit 75d9c82
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
previousEnv;

if (host.hasContent()) {
currentEnv = translate("Current Lifecycle Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view_name);
currentEnv = translate("Current Lifecycle Environment (%e/%cv)").replace("%e", host.content_facet_attributes.lifecycle_environment.name).replace("%cv", host.content_facet_attributes.content_view.name);
$scope.errataOptions = [{name: currentEnv, label: 'current', order: 3}];

if (!host['content_facet_attributes']['lifecycle_environment_library?']) {
Environment.get({id: host['content_facet_attributes'].lifecycle_environment.id}).$promise.then(function (env) {
previousEnv = translate("Previous Lifecycle Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view_name);
previousEnv = translate("Previous Lifecycle Environment (%e/%cv)").replace('%e', env.prior.name).replace("%cv", host.content_facet_attributes.content_view.name);
$scope.errataOptions.push({name: previousEnv,
label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view_id, 'environment_id': env.prior.id});
label: 'prior', order: 2, 'content_view_id': host.content_facet_attributes.content_view.id, 'environment_id': env.prior.id});

});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ <h3 translate>Apply to Content Hosts</h3>
</span>
</td>
<td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>
<td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment_name }}</td>
<td bst-table-cell>{{ contentHost.content_facet_attributes.content_view_name || "" }}</td>
<td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment.name }}</td>
<td bst-table-cell>{{ contentHost.content_facet_attributes.content_view.name || "" }}</td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 75d9c82

Please sign in to comment.