Ver Fonte

[home2] Fix create folder and delete

Johan Ahlen há 9 anos atrás
pai
commit
2d0261e

+ 4 - 4
desktop/core/src/desktop/static/desktop/js/assist/assistHelper.js

@@ -282,13 +282,13 @@
    * @param {Function} [options.errorCallback]
    * @param {boolean} [options.silenceErrors]
    *
-   * @param {string} options.path
+   * @param {string} options.parentUuid
    * @param {string} options.name
    */
   AssistHelper.prototype.createDocumentsFolder = function (options) {
     var self = this;
     $.post("/desktop/api2/doc/mkdir", {
-      parent_uuid: ko.mapping.toJSON(options.uuid),
+      parent_uuid: ko.mapping.toJSON(options.parentUuid),
       name: ko.mapping.toJSON(options.name)
     }, function (data) {
       if (! self.successResponseIsError(data)) {
@@ -367,13 +367,13 @@
    * @param {Function} [options.errorCallback]
    * @param {boolean} [options.silenceErrors]
    *
-   * @param {string} options.id
+   * @param {string} options.uuid
    * @param {string} [options.skipTrash] - Default false
    */
   AssistHelper.prototype.deleteDocument = function (options) {
     var self = this;
     $.post("/desktop/api2/doc/delete", {
-      doc_id: ko.mapping.toJSON(options.id),
+      uuid: ko.mapping.toJSON(options.uuid),
       skip_trash: ko.mapping.toJSON(options.skipTrash || false)
     }, function (data) {
       if (! self.successResponseIsError(data)) {

+ 4 - 5
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -38,7 +38,6 @@
    */
   function HueFileEntry (options) {
     var self = this;
-    self.uuid = options.uuid;
     self.activeEntry = options.activeEntry;
     self.parent = options.parent;
     self.definition = ko.observable(options.definition);
@@ -246,7 +245,7 @@
       self.assistHelper.fetchDocuments({
         uuid: self.uuid,
         successCallback: function(data) {
-          self.definition(data.directory);
+          self.definition(data.document);
           self.hasErrors(false);
 
           var newEntries = $.map(data.children, function (definition) {
@@ -310,7 +309,7 @@
 
       var deleteNext = function () {
         if (self.entriesToDelete().length > 0) {
-          var nextId = self.entriesToDelete().shift().definition().id;
+          var nextUuid = self.entriesToDelete().shift().definition().uuid;
           self.assistHelper.deleteDocument({
             successCallback: function () {
               deleteNext();
@@ -318,7 +317,7 @@
             errorCallback: function () {
               self.activeEntry().load();
             },
-            id: nextId
+            uuid: nextUuid
           });
         } else {
           self.activeEntry().load();
@@ -413,7 +412,7 @@
     if (self.app === 'documents') {
       self.assistHelper.createDocumentsFolder({
         successCallback: self.load.bind(self),
-        parent_uuid: self.uuid,
+        parentUuid: self.definition().uuid,
         name: name
       });
     }