[zeppelin] branch master updated: [ZEPPELIN-5255] Exported note name should included the note id

[zj...@apache.org]

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

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new a7cd80b  [ZEPPELIN-5255] Exported note name should included the note id
a7cd80b is described below

commit a7cd80b528c88219e7ff2eb5e4152541f4a9ac3c
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Fri Apr 2 14:09:18 2021 +0800

    [ZEPPELIN-5255] Exported note name should included the note id
    
    ### What is this PR for?
    
    Trivial PR to include note id into the exported note name so that the exported note name is consistent with the note name we stored in notebook repo.
    
    ### What type of PR is it?
    [Improvement]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5255
    
    ### How should this be tested?
    * Manually tested
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zj...@apache.org>
    
    Closes #4085 from zjffdu/ZEPPELIN-5255 and squashes the following commits:
    
    748b7d350 [Jeff Zhang] [ZEPPELIN-5255] Exported note name should included the note id
---
 zeppelin-web/src/app/notebook/notebook.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index ab260d8..49398c9 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -266,12 +266,12 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
         message: 'Do you still want to export this note?',
         callback: function(result) {
           if (result) {
-            saveAsService.saveAs(jsonContent, $scope.note.name, 'zpln');
+            saveAsService.saveAs(jsonContent, $scope.note.name + '_' + $scope.note.id, 'zpln');
           }
         },
       });
     } else {
-      saveAsService.saveAs(jsonContent, $scope.note.name, 'zpln');
+      saveAsService.saveAs(jsonContent, $scope.note.name + '_' + $scope.note.id, 'zpln');
     }
   };