Merge branch 'dev' into admin_app

client/galaxy/scripts/mvc/tours.js

@@ -31,7 +31,7 @@ define(['libs/bootstrap-tour'],function(BootstrapTour) {
                 };
             }
             if (step.postclick){
-                step.onHide = function(){
+                step.onNext = function(){
                     _.each(step.postclick, function(postclick){
                         // TODO: click delay between clicks
                         $(postclick).click();

config/plugins/tours/core.history.yaml

@@ -30,7 +30,7 @@ steps:
       intro: "URLs separated by a line break are automatically downloaded by Galaxy."
       position: "bottom"
       textinsert: |
-        https://wiki.galaxyproject.org/Images/GalaxyLogo?action=AttachFile&do=get&target=galaxy_project_logo.jpg
+        https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test-data/1.fasta
         https://raw.githubusercontent.com/bgruening/galaxytools/adf077b912ddebd97b07b947b855cdd2862ed8ef/tools/statistics/test-data/anderson.tabular
 
     - title: "Start the upload"
@@ -101,7 +101,7 @@ steps:
     - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.warnings > div > a.undelete-link"
       title: "Undeleting a dataset"
       intro: |
-            Galaxy datasets are only marked as deleled and can be recovered by clicking this link.
+            Galaxy datasets are only marked as deleted and can be recovered by clicking this link.
             Please note that datasets marked as deleted can be purged by your administrator at any time.
       position: "bottom"
       postclick:

lib/galaxy/managers/datasets.py

@@ -186,19 +186,21 @@ def serialize_file_name( self, dataset, key, user=None, **context ):
         of the file that contains this dataset's data.
         """
         is_admin = self.user_manager.is_admin( user )
-        # expensive: allow conifg option due to cost of operation
+        # expensive: allow config option due to cost of operation
         if is_admin or self.app.config.expose_dataset_path:
-            return dataset.file_name
+            if not dataset.purged:
+                return dataset.file_name
         self.skip()
 
     def serialize_extra_files_path( self, dataset, key, user=None, **context ):
         """
         If the config allows or the user is admin, return the file path.
         """
         is_admin = self.user_manager.is_admin( user )
-        # expensive: allow conifg option due to cost of operation
+        # expensive: allow config option due to cost of operation
         if is_admin or self.app.config.expose_dataset_path:
-            return dataset.extra_files_path
+            if not dataset.purged:
+                return dataset.extra_files_path
         self.skip()
 
     def serialize_permissions( self, dataset, key, user=None, **context ):

templates/show_params.mako

@@ -188,7 +188,9 @@
         <tr><td>UUID:</td><td>${hda.dataset.uuid}</td></tr>
         %endif
         %if trans.user_is_admin() or trans.app.config.expose_dataset_path:
-            <tr><td>Full Path:</td><td>${hda.file_name | h}</td></tr>
+            %if not hda.purged:
+                <tr><td>Full Path:</td><td>${hda.file_name | h}</td></tr>
+            %endif
         %endif
     </tbody>
 </table>