Merge pull request #7190 from martenson/fix-permission-api

[18.09] fix library dataset permission API

lib/galaxy/managers/library_datasets.py

@@ -8,13 +8,16 @@ from galaxy.exceptions import (
     ObjectNotFound,
     RequestParameterInvalidException
 )
-from galaxy.managers import tags
+from galaxy.managers import (
+    datasets,
+    tags
+)
 from galaxy.util import validation
 
 log = logging.getLogger(__name__)
 
 
-class LibraryDatasetsManager(object):
+class LibraryDatasetsManager(datasets.DatasetAssociationManager):
     """Interface/service object for interacting with library datasets."""
 
     def __init__(self, app):

lib/galaxy/webapps/galaxy/api/datasets.py

@@ -112,7 +112,7 @@ class DatasetsController(BaseAPIController, UsesVisualizationMixin):
             return self.hda_manager.serialize_dataset_association_roles(trans, dataset_assoc)
         else:
             self.ldda_manager.update_permissions(trans, dataset_assoc, **kwd)
-            return self.hda_manager.serialize_dataset_association_roles(trans, dataset_assoc)
+            return self.ldda_manager.serialize_dataset_association_roles(trans, dataset_assoc)
 
     def _dataset_state(self, trans, dataset, **kwargs):
         """

lib/galaxy/webapps/galaxy/api/library_datasets.py

@@ -155,7 +155,7 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin, Libra
         :rtype:     dictionary
         :returns:   dict of current roles for all available permission types
         """
-        return self.serialize_dataset_association_roles(library_dataset)
+        return self.ldda_manager.serialize_dataset_association_roles(trans, library_dataset)
 
     @expose_api
     def update(self, trans, encoded_dataset_id, payload=None, **kwd):