[galaxy-commits] commit/galaxy-central: smcmanus: Minor cleanup

17 Oct 2012

1 new commit in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/4c5297ac9919/
changeset:   4c5297ac9919
user:        smcmanus
date:        2012-10-18 00:01:45
summary:     Minor cleanup
affected #:  1 file

diff -r 91512b8e1a6ce1c91bd05482afe9a6a774a2ab93 -r 4c5297ac9919dd00bb08399131f7adb5892a8891 lib/galaxy/webapps/galaxy/api/folder_contents.py

--- a/lib/galaxy/webapps/galaxy/api/folder_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/folder_contents.py
@@ -22,7 +22,6 @@
         we want here. We could add a parameter to use the recursive
         style, but this is meant to act similar to an "ls" directory listing.
         """
-        log.debug( "FolderContentsController.index: enter" )
         rval = []
         current_user_roles = trans.get_current_user_roles()
 
@@ -30,19 +29,15 @@
             admin = trans.user_is_admin()
             rval = []
             for subfolder in folder.active_folders:
-                log.debug( "Subfolder type: %s" % type(subfolder) )
                 if not admin:
-                    log.debug( "calling check_folder_contents" )
                     can_access, folder_ids = trans.app.security_agent.check_folder_contents( trans.user, current_user_roles, subfolder )
                 if (admin or can_access) and not subfolder.deleted:
                     subfolder.api_type = 'folder'
                     rval.append( subfolder )
             for ld in folder.datasets:
-                log.debug( "Folder type: %s" % type(folder) )
                 if not admin:
                     can_access = trans.app.security_agent.can_access_dataset( current_user_roles, ld.library_dataset_dataset_association.dataset )
                 if (admin or can_access) and not ld.deleted:
-                    log.debug( "Folder attributes: %s" % dir(folder) )
                     ld.api_type = 'file'
                     rval.append( ld )
             return rval
@@ -56,7 +51,6 @@
         try:
             folder = trans.sa_session.query( trans.app.model.LibraryFolder ).get( decoded_folder_id )
             parent_library = folder.parent_library
-            log.debug( "parent library type: %s" % type(parent_library) )
         except:
             folder = None
             log.error( "FolderContentsController.index: Unable to retrieve folder %s"

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

    

[galaxy-commits] commit/galaxy-central: smcmanus: Minor cleanup

Bitbucket