Browse Source

[home2] Update sharing actions to use the new doc2 API

Johan Ahlen 9 years ago
parent
commit
21acdb1

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

@@ -256,14 +256,14 @@
    * @param {Function} [options.errorCallback]
    * @param {Function} [options.errorCallback]
    * @param {boolean} [options.silenceErrors]
    * @param {boolean} [options.silenceErrors]
    *
    *
-   * @param {number} options.docId
+   * @param {number} options.uuid
    */
    */
   AssistHelper.prototype.fetchDocument = function (options) {
   AssistHelper.prototype.fetchDocument = function (options) {
     var self = this;
     var self = this;
     $.ajax({
     $.ajax({
       url: DOCUMENT_API,
       url: DOCUMENT_API,
       data: {
       data: {
-        uuid: options.docId
+        uuid: options.uuid
       },
       },
       success: function (data) {
       success: function (data) {
         if (! self.successResponseIsError(data)) {
         if (! self.successResponseIsError(data)) {

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueDocument.js

@@ -165,7 +165,7 @@
 
 
     var fetchFunction = function () {
     var fetchFunction = function () {
       self.assistHelper.fetchDocument({
       self.assistHelper.fetchDocument({
-        docId: self.fileEntry.definition().id,
+        uuid: self.fileEntry.definition().uuid,
         successCallback: function (data) {
         successCallback: function (data) {
           self.prettifyUserNames(data.perms.write.users);
           self.prettifyUserNames(data.perms.write.users);
           self.prettifyUserNames(data.perms.read.users);
           self.prettifyUserNames(data.perms.read.users);

+ 1 - 1
desktop/core/src/desktop/templates/file_browser.mako

@@ -469,7 +469,7 @@ from desktop.views import _ko
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: function () { $('#createDirectoryModal').modal('show'); }"><span class="fa-stack fa-fw" style="width: 1.28571429em;"><i class="fa fa-folder-o fa-stack-1x" ></i><i class="fa fa-plus-circle fa-stack-1x" style="font-size: 14px; margin-left: 7px; margin-top: 3px;"></i></span></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: function () { $('#createDirectoryModal').modal('show'); }"><span class="fa-stack fa-fw" style="width: 1.28571429em;"><i class="fa fa-folder-o fa-stack-1x" ></i><i class="fa fa-plus-circle fa-stack-1x" style="font-size: 14px; margin-left: 7px; margin-top: 3px;"></i></span></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showDeleteConfirmation, css: { 'disabled': selectedEntries().length === 0 }"><i class="fa fa-fw fa-times"></i></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showDeleteConfirmation, css: { 'disabled': selectedEntries().length === 0 }"><i class="fa fa-fw fa-times"></i></a>
           <!-- ko if: app === 'documents' -->
           <!-- ko if: app === 'documents' -->
-          <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showSharingModal, css: { 'disabled': selectedEntries().length !== 1 }"><i class="fa fa-fw fa-users"></i></a>
+          <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: function() { showSharingModal(null) }, css: { 'disabled': selectedEntries().length !== 1 }"><i class="fa fa-fw fa-users"></i></a>
           <!-- /ko -->
           <!-- /ko -->
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: download"><i class="fa fa-fw fa-download"></i></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: download"><i class="fa fa-fw fa-download"></i></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showUploadModal"><i class="fa fa-fw fa-upload"></i></a>
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showUploadModal"><i class="fa fa-fw fa-upload"></i></a>