Sfoglia il codice sorgente

HUE-3756 [editor] Only insert the saved as in the saved query list

Romain Rigaux 9 anni fa
parent
commit
b9fb838

+ 3 - 0
desktop/libs/notebook/src/notebook/api.py

@@ -278,6 +278,7 @@ def save_notebook(request):
 
   notebook = json.loads(request.POST.get('notebook', '{}'))
   notebook_type = notebook.get('type', 'notebook')
+  save_as = True
 
   if notebook.get('parentSavedQueryUuid'): # We save into the original saved query, not into the query history
     notebook_doc = Document2.objects.get_by_uuid(user=request.user, uuid=notebook['parentSavedQueryUuid'])
@@ -286,6 +287,7 @@ def save_notebook(request):
   else:
     notebook_doc = Document2.objects.create(name=notebook['name'], uuid=notebook['uuid'], type=notebook_type, owner=request.user)
     Document.objects.link(notebook_doc, owner=notebook_doc.owner, name=notebook_doc.name, description=notebook_doc.description, extra=notebook_type)
+    save_as = False
 
     if notebook.get('directoryUuid'):
       notebook_doc.parent_directory = Document2.objects.get_by_uuid(user=request.user, uuid=notebook.get('directoryUuid'), perm_type='write')
@@ -303,6 +305,7 @@ def save_notebook(request):
   notebook_doc1.save()
 
   response['status'] = 0
+  response['save_as'] = save_as
   response.update(notebook_doc.to_dict())
   response['message'] = request.POST.get('editorMode') == 'true' and _('Query saved successfully') or _('Notebook saved successfully')
 

+ 4 - 2
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -1300,13 +1300,15 @@
           self.isHistory(false);
           $(document).trigger("info", data.message);
           if (vm.editorMode) {
-            self.snippets()[0].queries.unshift({
+            if (! data.save_as) {
+              self.snippets()[0].queries.unshift({
                 'uuid': data.uuid,
                 'name': data.name,
                 'description': data.description,
                 'owner': data.owner,
                 'last_modified': data.last_modified
-            });
+              });
+            }
             hueUtils.changeURL('/notebook/editor?editor=' + data.id);
           }
           else {