sample_tracking:

- bug fix in method to set library permissions for the data transfer user
- code cleanup

lib/galaxy/web/controllers/requests_admin.py

@@ -102,8 +102,7 @@ class DataTransferGrid( grids.Grid ):
             return sample_dataset.status
     # Grid definition
     title = "Sample Datasets"
-    # TODO: can this be grid.mako???
-    template = "admin/requests/datasets_grid.mako"
+    template = "admin/requests/grid.mako"
     model_class = model.SampleDataset
     default_sort_key = "-create_time"
     num_rows_per_page = 50
@@ -118,7 +117,9 @@ class DataTransferGrid( grids.Grid ):
         SizeColumn( "Size",
                     #key='size',
                     filterable="advanced" ),
-        grids.GridColumn( "Last Updated", key="update_time", format=time_ago ),
+        grids.GridColumn( "Last Updated", 
+                          key="update_time", 
+                          format=time_ago ),
         StatusColumn( "Status",
                       #key='status',
                       filterable="advanced" ),
@@ -560,7 +561,7 @@ class RequestsAdmin( BaseController, UsesFormDefinitionWidgets ):
             lfp = trans.model.LibraryFolderPermissions( trans.app.security_agent.permitted_actions.LIBRARY_ADD.action,
                                                         folder, 
                                                         datatx_user_private_role )
-            trans.sa_session.add( dp )
+            trans.sa_session.add( lfp )
             trans.sa_session.flush()
         return datatx_user
     def __send_message( self, trans, datatx_info, sample, id_list ):

templates/admin/requests/datasets_grid.mako

@@ -1,27 +0,0 @@
-<%def name="custom_javascripts()">
-    <script type="text/javascript">
-        $("#select-dataset-action-button").bind( "click", function(e) {
-            $.ajax({
-                url: "${h.url_for( controller='requests_admin', action='remote_file_browser' )}",
-                data: {id: 6},
-                error: function() { alert( "Couldn't create new browser" ) },
-                success: function(form_html) {
-                    show_modal("Select file", form_html, {
-                        "Cancel": function() { window.location = "${h.url_for( controller='requests_admin', action='browse_requests' )}"; },
-                        "Continue": function() { $(document).trigger("convert_dbkeys"); continue_fn(); }
-                    });
-                    $("#new-title").focus();
-                    replace_big_select_inputs();
-                }
-            });
-        }
-    </script>
-</%def>
-
-<%def name="javascripts()">
-   ${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jquery.event.drag", "jquery.autocomplete", "jquery.mousewheel", "trackster", "ui.core", "ui.sortable" )}   
-   ${self.custom_javascripts()}
-   ${parent.javascripts()}
-</%def>
-
-<%inherit file="/grid_base.mako"/>