Переглянути джерело

HUE-8974 [tb] Fix drop database and table actions

Johan Ahlen 6 роки тому
батько
коміт
38a59bb18a

+ 2 - 2
apps/metastore/src/metastore/templates/metastore.mako

@@ -342,7 +342,7 @@ ${ components.menubar(is_embeddable) }
             <input type="hidden" name="start_time" value=""/>
             <input type="hidden" name="source_type" data-bind="value: $root.source().type"/>
             <!-- ko with: catalogEntry -->
-            <input type="hidden" name="namespace" data-bind="value: namespace.id"/>
+            <input type="hidden" name="namespace" data-bind="value: JSON.stringify(namespace)"/>
             <input type="hidden" name="cluster" data-bind="value: JSON.stringify(compute)"/>
             <!-- /ko -->
         % else:
@@ -525,7 +525,7 @@ ${ components.menubar(is_embeddable) }
         <input type="hidden" name="is_embeddable" value="true"/>
         <input type="hidden" name="start_time" value=""/>
         <input type="hidden" name="source_type" data-bind="value: $root.source().type"/>
-        <input type="hidden" name="namespace" data-bind="value: catalogEntry.namespace.id"/>
+        <input type="hidden" name="namespace" data-bind="value: JSON.stringify(catalogEntry.namespace)"/>
         <input type="hidden" name="cluster" data-bind="value: JSON.stringify(catalogEntry.compute)"/>
     % else:
       <form data-bind="attr: { 'action': '/metastore/tables/drop/' + catalogEntry.name }" method="POST">

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

@@ -113,7 +113,7 @@ def drop_database(request):
         design = SavedQuery.create_empty(app_name=source_type if source_type != 'hive' else 'beeswax', owner=request.user, data=hql_query('').dumps())
         last_executed = json.loads(request.POST.get('start_time'), '-1')
         cluster = json.loads(request.POST.get('cluster', '{}'))
-        namespace = request.POST.get('namespace')
+        namespace = json.loads(request.POST.get('namespace', '{}'))
         sql = db.drop_databases(databases, design, generate_ddl_only=True)
         job = make_notebook(
             name=_('Drop database %s') % ', '.join(databases)[:100],
@@ -445,7 +445,7 @@ def drop_table(request, database):
       tables_objects = [db.get_table(database, table) for table in tables]
       skip_trash = request.POST.get('skip_trash') == 'on'
       cluster = json.loads(request.POST.get('cluster', '{}'))
-      namespace = request.POST.get('namespace')
+      namespace = json.loads(request.POST.get('namespace', '{}'))
 
       if request.POST.get('is_embeddable'):
         last_executed = json.loads(request.POST.get('start_time'), '-1')