You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/01/25 18:57:27 UTC

[38/50] [abbrv] ambari git commit: AMBARI-19671. Hive View 2.0: Incorrect behaviour on select of database (Abhishek Kumar via pallavkul)

AMBARI-19671. Hive View 2.0: Incorrect behaviour on select of database (Abhishek Kumar via pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72e02ab0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72e02ab0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72e02ab0

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 72e02ab089b07246b2c79eb5e94825f1c19ad3cf
Parents: bb8b44c
Author: pallavkul <pa...@gmail.com>
Authored: Wed Jan 25 09:09:47 2017 +0530
Committer: pallavkul <pa...@gmail.com>
Committed: Wed Jan 25 09:09:47 2017 +0530

----------------------------------------------------------------------
 .../main/resources/ui/app/templates/queries/query.hbs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/72e02ab0/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
index 950e4f3..9e9e542 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
@@ -84,21 +84,21 @@
 <div class="col-md-3 database-panel">
   <div class="database-container">
     <div class="row">
-    <div class="panel-group database-panel" id="accordion" role="tablist" aria-multiselectable="true">
+    <div class="panel-group database-panel" id="db_accordion" role="tablist" aria-multiselectable="true">
       {{#each selectedTablesModels as |tableModel|}}
         <div class="panel panel-default">
-          <div class="panel-heading" role="tab">
+          <div class="panel-heading" role="tab" id={{concat 'db_heading_' tableModel.dbname}}>
             <h4 class="panel-title">
-              <a role="button" data-toggle="collapse" data-parent="#accordion"
+              <a role="button" data-i-toggle="collapse" data-i-parent="#db_accordion"
                  href="javascript:void(0)" {{action 'showTables' tableModel.dbname }} aria-expanded="true"
-                 aria-controls={{tableModel.dbname}}>
-                {{ tableModel.dbname }} {{#if tableModel.isSelected}} {{fa-icon "check"}}  {{/if}}
+                 aria-controls={{concat 'db_body_' tableModel.dbname}}>
+                {{ tableModel.dbname }} {{#if (eq tableModel.dbname worksheet.selectedDb)}} {{fa-icon "check"}}  {{/if}}
               </a>
               <small class="pull-right">Tables({{tableModel.tables.length}})</small>
             </h4>
           </div>
-          <div id={{ tableModel.dbname }} class="db-tables collapse panel-collapse {{if singleDbModel 'in'}}" role="tabpanel"
-          aria-labelledby="headingOne">
+          <div id={{concat 'db_body_' tableModel.dbname}} class="db-tables collapse panel-collapse {{if (eq tableModel.dbname worksheet.selectedDb) 'in'}}" role="tabpanel"
+          aria-labelledby={{concat 'db_heading_' tableModel.dbname}}>
           <div class="panel-body">
             {{#if tableModel.tables.length }}
               {{#list-filter header="tables" items=tableModel.tables