Browse Source

AMBARI-7122. Configs: when there is only one version, dropdown list is empty.(XIWANG)

Xi Wang 10 years ago
parent
commit
03684175c8

+ 19 - 4
ambari-web/app/styles/application.less

@@ -5120,16 +5120,31 @@ ul.inline li {
       font-size: 13px;
       font-size: 13px;
       li {
       li {
         line-height: 30px;
         line-height: 30px;
+        .icon-caret-right {
+          font-size: 18px;
+          margin-right: 20px;
+        }
       }
       }
       li:hover {
       li:hover {
         background-color: #666666;
         background-color: #666666;
         background-image: linear-gradient(to bottom, #666666, #555555);
         background-image: linear-gradient(to bottom, #666666, #555555);
-        color: white;
+        color: #ffffff;
       }
       }
-      .icon-caret-right {
-        font-size: 18px;
-        margin-right: 20px;
+      li.not-allowed {
+        // the version which is displayed
+        cursor: not-allowed;
+        color: #808080;
+        .icon-caret-right,
+        .dropdown-menu {
+          display: none;
+        }
       }
       }
+      li.not-allowed:hover {
+        background-color: #ffffff;
+        background-image: none;
+        color: #808080;
+      }
+
       div.row-fluid, a {
       div.row-fluid, a {
         padding-left: 10px;
         padding-left: 10px;
       }
       }

+ 2 - 2
ambari-web/app/templates/common/configs/config_history_flow.hbs

@@ -88,8 +88,8 @@
                   </button>
                   </button>
                   <ul class="dropdown-menu">
                   <ul class="dropdown-menu">
                     {{#each serviceVersion in view.dropDownList}}
                     {{#each serviceVersion in view.dropDownList}}
-                        <li class="pointer dropdown-submenu">
-                            <div class="row-fluid version-in-dropdown" {{action switchVersion serviceVersion target="view"}}>
+                        <li {{bindAttr class=":pointer :dropdown-submenu serviceVersion.isDisplayed:not-allowed"}}>
+                            <div class="row-fluid version-in-dropdown " {{action switchVersion serviceVersion target="view"}}>
                                 <div class="span2">{{serviceVersion.versionText}}</div>
                                 <div class="span2">{{serviceVersion.versionText}}</div>
                                 <div class="span6">{{serviceVersion.modifiedDate}}</div>
                                 <div class="span6">{{serviceVersion.modifiedDate}}</div>
                                 <div class="span3">{{serviceVersion.author}}</div>
                                 <div class="span3">{{serviceVersion.author}}</div>

+ 2 - 1
ambari-web/app/views/common/configs/config_history_flow.js

@@ -126,7 +126,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
    * by default 6 is number of items in short list
    * by default 6 is number of items in short list
    */
    */
   dropDownList: function () {
   dropDownList: function () {
-    var serviceVersions = this.get('serviceVersions').without(this.get('displayedServiceVersion')).slice(0).reverse();
+    var serviceVersions = this.get('serviceVersions').slice(0).reverse();
     if (this.get('showFullList')) {
     if (this.get('showFullList')) {
       return serviceVersions;
       return serviceVersions;
     }
     }
@@ -282,6 +282,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
    * switch configs view version to chosen
    * switch configs view version to chosen
    */
    */
   switchVersion: function (event) {
   switchVersion: function (event) {
+    if (event.context.get("isDisplayed"))  return;
     var version = event.context.get('version');
     var version = event.context.get('version');
     var versionIndex = 0;
     var versionIndex = 0;