Browse Source

[metastore] Simplify table page listing

Romain Rigaux 9 years ago
parent
commit
0b74de8

+ 0 - 15
apps/metastore/src/metastore/templates/metastore.mako

@@ -380,11 +380,6 @@ ${ assist.assistPanel() }
                 <!-- /ko -->
               </form>
             </div>
-            % if is_optimizer_enabled:
-              <button class="btn toolbarBtn margin-left-20" title="${_('Browse the selected table in Optimizer')}" data-bind="click: function () { setTable(selectedTables()[0]); selectedTables([]); }, disable: selectedTables().length !== 1">
-                <i class="fa fa-eye"></i> ${_('View in Optimizer')}
-              </button>
-            % endif
           % endif
         </div>
 
@@ -395,11 +390,6 @@ ${ assist.assistPanel() }
             <th>&nbsp;</th>
             <th>${ _('Table Name') }</th>
             <th>${ _('Comment') }</th>
-            % if is_optimizer_enabled:
-            <th>${ _('Popularity') }</th>
-            <th>${ _('Column count') }</th>
-            <th>${ _('Fact / Dimension') }</th>
-            % endif
             <th>${ _('Type') }</th>
           </tr>
           </thead>
@@ -421,11 +411,6 @@ ${ assist.assistPanel() }
                 <a class="tableLink" href="javascript:void(0);" data-bind="text: name, click: function() { $parent.setTable($data, function(){ huePubSub.publish('metastore.url.change'); }) }"></a>
               </td>
               <td data-bind="text: comment"></td>
-              % if is_optimizer_enabled:
-              <td>28% access (8)</td>
-              <td>15 columns</td>
-              <td>Dimension</td>
-              % endif
               <td>
                 <!-- ko if: type == 'Table' -->
                   <i class="fa fa-fw fa-table muted" title="${ _('Table') }"></i>

+ 2 - 4
apps/metastore/src/metastore/views.py

@@ -36,11 +36,10 @@ from beeswax.models import SavedQuery, MetaInstall
 from beeswax.server import dbms
 from beeswax.server.dbms import get_query_server_config
 from filebrowser.views import location_to_url
-from metadata.optimizer_client import is_optimizer_enabled
-from notebook.connectors.base import Notebook
-
 from metastore.forms import LoadDataForm, DbForm
 from metastore.settings import DJANGO_APPS
+from notebook.connectors.base import Notebook
+
 
 LOG = logging.getLogger(__name__)
 
@@ -180,7 +179,6 @@ def show_tables(request, database=None):
     'database': None,
     'partitions': [],
     'has_write_access': has_write_access(request.user),
-    'is_optimizer_enabled': is_optimizer_enabled() and request.user.is_superuser
     })
 
   return resp