This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new d2cd06a  AMBARI-25441. HDP-GPL field is not available in version 
registration page but present in edit page
     new 264f77e  Merge pull request #3149 from hiveww/AMBARI-25441-branch-2.7
d2cd06a is described below

commit d2cd06a49f33407d15a690d8f20f8c38d19a9521
Author: Alex Antonenko <aantone...@hortonworks.com>
AuthorDate: Tue Dec 3 15:22:26 2019 +0200

    AMBARI-25441. HDP-GPL field is not available in version registration page 
but present in edit page
---
 .../main/admin/stack_upgrade/edit_repositories.hbs         | 14 ++++++++------
 .../main/admin/stack_upgrade/upgrade_version_box_view.js   |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
index 263b902..333698f 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
@@ -38,12 +38,14 @@
           <table class="table table-condensed no-borders inner-table">
             <tbody>
               {{#each repository in os.repositories}}
-                <tr {{bindAttr class="repository.repoName"}}>
-                  <td class="col-md-2">{{repository.repoName}}</td>
-                  <td class="col-md-8">
-                    <div {{bindAttr class="repository.hasError:error 
:form-group"}}>{{view App.BaseUrlTextField repositoryBinding="repository" 
disabledBinding="view.content.useRedhatSatellite"}}</div>
-                  </td>
-                </tr>
+                {{#if repository.showRepo}}
+                  <tr {{bindAttr class="repository.repoName"}}>
+                    <td class="col-md-2">{{repository.repoName}}</td>
+                    <td class="col-md-8">
+                      <div {{bindAttr class="repository.hasError:error 
:form-group"}}>{{view App.BaseUrlTextField repositoryBinding="repository" 
disabledBinding="view.content.useRedhatSatellite"}}</div>
+                    </td>
+                  </tr>
+                {{/if}}
               {{/each}}
             </tbody>
           </table>
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 83bf7aa..3cbd6e9 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -480,7 +480,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
               repoName: repository.get('repoName'),
               repoId: repository.get('repoId'),
               baseUrl: repository.get('baseUrl'),
-              hasError: false
+              hasError: false,
+              showRepo: repository.get('showRepo')
             });
           })
         });

Reply via email to