Explorar o código

[doc2] Fix history fetching and update documents API in JS

Jenny Kim %!s(int64=9) %!d(string=hai) anos
pai
achega
daa6bc2

+ 1 - 1
desktop/core/src/desktop/api2.py

@@ -84,7 +84,7 @@ def search_documents(request):
   flatten = json.loads(request.GET.get('flatten', 'true'))
 
   if perms not in ['owned', 'shared', 'both']:
-    raise Exception(_('Invalid value for perms, acceptable values are: owned, shared, both.'))
+    raise PopupException(_('Invalid value for perms, acceptable values are: owned, shared, both.'))
 
   documents = Document2.objects.documents(user=request.user, perms=perms, include_history=include_history)
 

+ 1 - 1
desktop/core/src/desktop/models.py

@@ -818,7 +818,7 @@ class Document2Manager(models.Manager):
     return docs[0]
 
   def get_history(self, user, doc_type):
-    return self.documents(user).filter(type=doc_type, is_history=True)
+    return self.documents(user, perms='owned', include_history=True).filter(type=doc_type, is_history=True)
 
   def get_home_directory(self, user):
     try:

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

@@ -26,8 +26,7 @@
   var AUTOCOMPLETE_API_PREFIX = "/notebook/api/autocomplete/";
   var HDFS_API_PREFIX = "/filebrowser/view=";
   var HDFS_PARAMETERS = "?pagesize=100&format=json";
-  var DOCUMENTS_API = "/desktop/api2/docs/";
-  var DOCUMENT_API = "/desktop/api2/doc/get";
+  var DOCUMENTS_API = "/desktop/api2/doc/";
 
 
   /**
@@ -309,7 +308,7 @@
   AssistHelper.prototype.fetchDocument = function (options) {
     var self = this;
     $.ajax({
-      url: DOCUMENT_API,
+      url: DOCUMENTS_API,
       data: {
         uuid: options.uuid
       },

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

@@ -167,9 +167,9 @@
       self.assistHelper.fetchDocument({
         uuid: self.fileEntry.definition().uuid,
         successCallback: function (data) {
-          self.prettifyUserNames(data.perms.write.users);
-          self.prettifyUserNames(data.perms.read.users);
-          self.definition(data);
+          self.prettifyUserNames(data.document.perms.write.users);
+          self.prettifyUserNames(data.document.perms.read.users);
+          self.definition(data.document);
           self.loading(false);
           self.loaded(true);
         },

+ 2 - 2
desktop/core/src/desktop/urls.py

@@ -116,9 +116,9 @@ dynamic_patterns += patterns('desktop.api',
 )
 
 dynamic_patterns += patterns('desktop.api2',
-  (r'^desktop/api2/docs/?$', 'search_documents'),
+  (r'^desktop/api2/docs/?$', 'search_documents'),  # search documents for current user
+  (r'^desktop/api2/doc/?$', 'get_document'),  # get doc/dir by path or UUID
 
-  (r'^desktop/api2/doc/?$', 'get_document'),
   (r'^desktop/api2/doc/move/?$', 'move_document'),
   (r'^desktop/api2/doc/mkdir/?$', 'create_directory'),
   (r'^desktop/api2/doc/delete/?$', 'delete_document'),