From 24409ee07efeb1c42dc567cd0590c4a4efcf29fc Mon Sep 17 00:00:00 2001
From: Greg Von Kuster <greg@bx.psu.edu>
Date: Tue, 8 Jun 2010 13:25:15 -0400
Subject: [PATCH] Fixes for displaying history items and library datasets that
 use a specified dataset file.

---
 templates/library/common/ldda_info.mako     | 26 +++++++++++++++++----
 templates/webapps/reports/dataset_info.mako | 12 +++++++---
 templates/webapps/reports/system.mako       |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/templates/library/common/ldda_info.mako b/templates/library/common/ldda_info.mako
index bc2ab64d749..f8f9597c6c5 100644
--- a/templates/library/common/ldda_info.mako
+++ b/templates/library/common/ldda_info.mako
@@ -135,7 +135,7 @@
 %if cntrller == 'library_admin':
     %if associated_hdas:
         <p/>
-        <b>History items that use this library dataset's disk file</b>
+        <b>Active (undeleted) history items that use this library dataset's disk file</b>
         <div class="toolForm">
             <table class="grid">
                 <thead>
@@ -172,7 +172,7 @@
     %endif
     %if associated_lddas:
         <p/>
-        <b>Other library datasets that use this library dataset's disk file</b>
+        <b>Other active (undeleted) library datasets that use this library dataset's disk file</b>
         <div class="toolForm">
             <table class="grid">
                 <thead>
@@ -188,13 +188,29 @@
                     <% containing_library = get_containing_library_from_library_dataset( trans, copied_ldda.library_dataset ) %>
                     <tr>
                         <td>
+                            <%
+                                if containing_library:
+                                    library_display_name = containing_library.get_display_name()
+                                else:
+                                    library_display_name = 'no library'
+                            %>
                             %if containing_library:
-                                <a href="${h.url_for( controller='library_common', action='browse_library', id=trans.security.encode_id( containing_library.id ), cntrller=cntrller, use_panels=use_panels )}">${containing_library.get_display_name()}</a>
+                                <a href="${h.url_for( controller='library_common', action='browse_library', id=trans.security.encode_id( containing_library.id ), cntrller=cntrller, use_panels=use_panels )}">${library_display_name}</a>
                             %else:
-                                error finding library
+                                ${library_display_name}
                             %endif
                         </td>
-                        <td>${copied_ldda.library_dataset.folder.get_display_name()}</td>
+                        <td>
+                            <%
+                                library_dataset = copied_ldda.library_dataset
+                                folder = library_dataset.folder
+                                folder_display_name = folder.get_display_name()
+                                if folder_display_name == library_display_name:
+                                    folder_display_name = 'library root'
+                            %>
+                            ${folder_display_name}
+                            ${copied_ldda.library_dataset.folder.get_display_name()}
+                        </td>
                         <td>${copied_ldda.get_display_name()}</td>
                         <td>${time_ago( copied_ldda.update_time )}</td>
                         <td>
diff --git a/templates/webapps/reports/dataset_info.mako b/templates/webapps/reports/dataset_info.mako
index 4b490100326..31632e809f2 100644
--- a/templates/webapps/reports/dataset_info.mako
+++ b/templates/webapps/reports/dataset_info.mako
@@ -50,11 +50,17 @@
             </thead>
             %for hda in associated_hdas:
                 <tr>
-                    <td>${hda.history.get_display_name()}</td>
+                    <td>
+                        %if hda.history:
+                            ${hda.history.get_display_name()}
+                        %else:
+                            no history
+                        %endif
+                    </td>
                     <td>${hda.get_display_name()}</td>
                     <td>${time_ago( hda.update_time )}</td>
                     <td>
-                        %if hda.history.user:
+                        %if hda.history and hda.history.user:
                             ${hda.history.user.email}
                         %else:
                             anonymous
@@ -88,7 +94,7 @@
                             if containing_library:
                                 library_display_name = containing_library.get_display_name()
                             else:
-                                library_display_name = 'error finding library'
+                                library_display_name = 'no library'
                         %>
                         ${library_display_name}
                     </td>
diff --git a/templates/webapps/reports/system.mako b/templates/webapps/reports/system.mako
index 5e6c12d4511..2bace12ee17 100644
--- a/templates/webapps/reports/system.mako
+++ b/templates/webapps/reports/system.mako
@@ -78,7 +78,7 @@
                     <tr class="tr">
                 %endif
                     <td>
-                        <% dataset_label = 'dataset%d_.dat' % dataset.id %>
+                        <% dataset_label = 'dataset_%d.dat' % dataset.id %>
                         <a href="${h.url_for( controller='system', action='dataset_info', id=trans.security.encode_id( dataset.id ) )}">${dataset_label}</a>
                     </td>
                     <td>${time_ago( dataset.update_time )}</td>