This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 048f42c673 AMBARI-26200: Stack and versions page display issue after
JQ upgrade (#3858)
048f42c673 is described below
commit 048f42c6732a82736819c6e882ad749f7577cc75
Author: zrain <[email protected]>
AuthorDate: Fri Oct 25 14:45:09 2024 +0800
AMBARI-26200: Stack and versions page display issue after JQ upgrade (#3858)
AMBARI-26200: Stack and versions page display issue after JQ upgrade #3858
---
.../admin/stack_upgrade/upgrade_version_column.hbs | 34 ++++++++++++++--------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 6e0ff4bfd2..b5bb55d76f 100644
---
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -20,6 +20,8 @@
<i class="glyphicon glyphicon-exclamation-sign out-of-sync-badge"></i>
{{/if}}
+<div class="service-cell-wrapper repo-info">
+ <div class="service-cell">
<p class="version-column-display-name">
{{#if view.content.isStandard}}
<span>{{view.content.displayNameSimple}}</span>
@@ -31,7 +33,7 @@
<p
class="version-column-repository-name">({{view.content.repositoryVersion}})</p>
{{#if view.displayVersionTypeBlock}}
- <p class="version-column-display-type">
+ <div class="version-column-display-type">
{{#if view.content.isMaint}}
<i class="icon-wrench"></i> {{t common.maint}}
{{/if}}
@@ -41,12 +43,13 @@
{{#if view.content.isService}}
<i class="icon-umbrella"></i> {{t common.service}}
{{/if}}
- </p>
+ </div>
{{/if}}
<p class="version-column-show-details">
- <a href="#" {{action openVersionBoxPopup target="view"}}>{{t
admin.stackVersions.version.column.showDetails}}</a>
+ <a {{action openVersionBoxPopup target="view"}}>{{t
admin.stackVersions.version.column.showDetails}}</a>
</p>
+
<div {{bindAttr class="view.stateElement.isInstalling:installing
:align-center :state :repo-version-tooltip"}}>
{{#if view.stateElement.isButton}}
<button class="btn btn-primary"
@@ -62,7 +65,8 @@
{{bindAttr disabled="view.stateElement.isDisabled"}}>
{{view.stateElement.text}}
</button>
- <button class="btn btn-primary dropdown-toggle"
data-bs-toggle="dropdown" {{bindAttr disabled="view.stateElement.isDisabled"}}>
+ <button class="btn btn-primary dropdown-toggle"
+ data-toggle="dropdown" {{bindAttr
disabled="view.stateElement.isDisabled"}}>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
@@ -80,14 +84,14 @@
{{#if view.stateElement.iconClass}}
<i {{bindAttr class="view.stateElement.iconClass"
disabled="view.stateElement.isDisabled"}}></i>
{{/if}}
- <span {{bindAttr
class="view.stateElement.class"}}>{{view.stateElement.text}}</span>
+ <span {{bindAttr class=":state-label
view.stateElement.class"}}>{{view.stateElement.text}}</span>
{{/if}}
{{#if view.stateElement.isLink}}
{{#if view.stateElement.iconClass}}
<i {{bindAttr class="view.stateElement.iconClass"
disabled="view.stateElement.isDisabled"}}></i>
{{/if}}
<a href="#" {{action runAction target="view"}}
- {{bindAttr
disabled="view.stateElement.isDisabled"}}>{{view.stateElement.text}}</a>
+ {{bindAttr
disabled="view.stateElement.isDisabled"}}>{{view.stateElement.text}}</a>
{{#if view.stateElement.isInstalling}}
{{view App.ProgressBarView
progressBinding="view.installProgress"
@@ -102,15 +106,21 @@
</div>
</div>
-<div class="services-section">
+<div class="service-section">
{{#each service in view.services}}
- <p class="service-version-info">
- <span {{bindAttr class="service.isVersionInvisible:invisible
service.isAvailable:available :label"}}>
- {{service.latestVersion}}
- </span>
+ <div class="service-cell-wrapper">
+ <div class="service-cell service-version-info">
+ <span {{bindAttr class="service.isVersionInvisible:invisible
service.isAvailable:available :label"}}>
+ {{service.latestVersion}}
+ </span>
{{#if service.notUpgradable}}
<i class="icon-info-sign not-upgradable" {{bindAttr
data-original-title="service.notUpgradableTitle"}}></i>
{{/if}}
- </p>
+ </div>
+ </div>
{{/each}}
+ <div class="service-cell-wrapper">
+ <div class="service-cell">
+ </div>
+ </div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
