From greg@bx.psu.edu Fri Dec 12 14:38:45 2008
From: Greg Von Kuster <greg@bx.psu.edu>
To: galaxy-dev@lists.galaxyproject.org
Subject: [galaxy-dev] [hg] galaxy 1663: Fix for showing deleted datasets in	a
 history, ...
Date: Fri, 12 Dec 2008 14:37:29 -0500
Message-ID: <hg.0af3897ce585.1229110649.1070624311@scofield.bx.psu.edu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4355827893878162677=="

--===============4355827893878162677==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

details:   http://www.bx.psu.edu/hg/galaxy/rev/0af3897ce585
changeset: 1663:0af3897ce585
user:      Greg Von Kuster <greg(a)bx.psu.edu>
date:      Fri Dec 12 14:33:51 2008 -0500
description:
Fix for showing deleted datasets in a history, also yet another fix for the n=
ew users report, users are now sorted descending by last login, as the report=
 states.

4 file(s) affected in this change:

lib/galaxy/webapps/reports/controllers/users.py
lib/galaxy/webapps/reports/templates/users_last_access_date.mako
templates/history/options.mako
templates/root/history.mako

diffs (73 lines):

diff -r d53da5b089a8 -r 0af3897ce585 lib/galaxy/webapps/reports/controllers/u=
sers.py
--- a/lib/galaxy/webapps/reports/controllers/users.py	Fri Dec 12 12:12:59 200=
8 -0500
+++ b/lib/galaxy/webapps/reports/controllers/users.py	Fri Dec 12 14:33:51 200=
8 -0500
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 from time import strftime
-import calendar
+import calendar, operator
 from galaxy.webapps.reports.base.controller import *
 import galaxy.model
 from galaxy.model.orm import *
@@ -112,6 +112,7 @@
             else:
                 # The user has never logged in
                 users.append( ( user.email, "never logged in" ) )
+        users =3D sorted( users, key=3Doperator.itemgetter( 1 ), reverse=3DT=
rue )
         return trans.fill_template( 'users_last_access_date.mako',
                                     users=3Dusers,
                                     not_logged_in_for_days=3Dnot_logged_in_f=
or_days,
diff -r d53da5b089a8 -r 0af3897ce585 lib/galaxy/webapps/reports/templates/use=
rs_last_access_date.mako
--- a/lib/galaxy/webapps/reports/templates/users_last_access_date.mako	Fri De=
c 12 12:12:59 2008 -0500
+++ b/lib/galaxy/webapps/reports/templates/users_last_access_date.mako	Fri De=
c 12 14:33:51 2008 -0500
@@ -13,7 +13,12 @@
             <td>
                 <form method=3D"post" controller=3D"users" action=3D"last_ac=
cess_date">
                     <p>
-                        Users that have not logged in to Galaxy for=20
+                        %if users:
+                            ${len( users ) }
+                        %else:
+                            0
+                        %endif=20
+                        &nbsp;users have not logged in to Galaxy for=20
                         <input type=3D"textfield" value=3D"${not_logged_in_f=
or_days}" size=3D"3" name=3D"not_logged_in_for_days"> days.
                         &nbsp;<button name=3D"action" value=3D"not_logged_in=
_for_days">Go</button>
                     </p>
diff -r d53da5b089a8 -r 0af3897ce585 templates/history/options.mako
--- a/templates/history/options.mako	Fri Dec 12 12:12:59 2008 -0500
+++ b/templates/history/options.mako	Fri Dec 12 14:33:51 2008 -0500
@@ -11,15 +11,15 @@
=20
 <ul>
 %if user:
-    <li><a href=3D"${h.url_for( action=3D'history_rename', id=3Dhistory.id )=
}" target=3D"galaxy_main">Rename</a> current history (stored as "${history.na=
me}")</li>
-    <li><a href=3D"${h.url_for( action=3D'history_available')}" target=3D"ga=
laxy_main">List</a> previously stored histories</li>
+    <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history_renam=
e', id=3Dhistory.id )}" target=3D"galaxy_main">Rename</a> current history (st=
ored as "${history.name}")</li>
+    <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history_avail=
able')}" target=3D"galaxy_main">List</a> previously stored histories</li>
     %if len( history.active_datasets ) > 0:
-        <li><a href=3D"${h.url_for('/history_new')}">Create</a> a new empty =
history</li>
+        <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history_n=
ew' )}">Create</a> a new empty history</li>
     %endif
     <li><a href=3D"${h.url_for( controller=3D'workflow', action=3D'build_fro=
m_current_history' )}">Construct workflow</a> from the current history</li>
-    <li><a href=3D"${h.url_for( action=3D'history_share' )}" target=3D"galax=
y_main">Share</a> current history</div>
+    <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history_share=
' )}" target=3D"galaxy_main">Share</a> current history</div>
 %endif
-    <li><a href=3D"${h.url_for( action=3D'history', show_deleted=3DTrue)}" t=
arget=3D"galaxy_history">Show deleted</a> datasets in history</li>
-    <li><a href=3D"${h.url_for( action=3D'history_delete', id=3Dhistory.id )=
}" confirm=3D"Are you sure you want to delete the current history?">Delete</a=
> current history</div>
+    <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history', sho=
w_deleted=3DTrue)}" target=3D"galaxy_history">Show deleted</a> datasets in hi=
story</li>
+    <li><a href=3D"${h.url_for( controller=3D'root', action=3D'history_delet=
e', id=3Dhistory.id )}" confirm=3D"Are you sure you want to delete the curren=
t history?">Delete</a> current history</div>
 </ul>
=20
diff -r d53da5b089a8 -r 0af3897ce585 templates/root/history.mako
--- a/templates/root/history.mako	Fri Dec 12 12:12:59 2008 -0500
+++ b/templates/root/history.mako	Fri Dec 12 14:33:51 2008 -0500
@@ -248,7 +248,7 @@
=20
 <%namespace file=3D"history_common.mako" import=3D"render_dataset" />
=20
-%if ( show_deleted and len( history.datasets ) < 1 ) or len( history.active_=
datasets ) < 1:
+%if ( show_deleted and not history.activatable_datasets ) or ( not show_dele=
ted and not history.active_datasets ):
     <div class=3D"infomessagesmall" id=3D"emptyHistoryMessage">
 %else:   =20
     <%

--===============4355827893878162677==--