2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/aaa62e323fb0/ Changeset: aaa62e323fb0 User: ericenns Date: 2014-10-31 14:30:41+00:00 Summary: Update job time output in admin manage jobs to prevent rollover when time surpasses 24 hours Affected #: 1 file diff -r dcd77603b24da934ba6f0fae63da8ddfea55d10b -r aaa62e323fb02c58dc383867b3a9c6d786328fe4 lib/galaxy/web/base/controllers/admin.py --- a/lib/galaxy/web/base/controllers/admin.py +++ b/lib/galaxy/web/base/controllers/admin.py @@ -1124,7 +1124,9 @@ last_updated = {} for job in jobs: delta = datetime.utcnow() - job.update_time - if delta > timedelta( minutes=60 ): + if delta.days > 0: + last_updated[job.id] = '%s hours' % ( delta.days * 24 + int( delta.seconds / 60 / 60 ) ) + elif delta > timedelta( minutes=59 ): last_updated[job.id] = '%s hours' % int( delta.seconds / 60 / 60 ) else: last_updated[job.id] = '%s minutes' % int( delta.seconds / 60 ) https://bitbucket.org/galaxy/galaxy-central/commits/51f4c1c7fce7/ Changeset: 51f4c1c7fce7 User: jmchilton Date: 2014-11-02 21:16:01+00:00 Summary: Merged in ericenns/galaxy-central (pull request #546) Update admin manage jobs time calculation Affected #: 1 file diff -r ce6691088fd59ff13d2566e224551ccccd7ad569 -r 51f4c1c7fce753eb28ec907715d324a2bca2c84a lib/galaxy/web/base/controllers/admin.py --- a/lib/galaxy/web/base/controllers/admin.py +++ b/lib/galaxy/web/base/controllers/admin.py @@ -1124,7 +1124,9 @@ last_updated = {} for job in jobs: delta = datetime.utcnow() - job.update_time - if delta > timedelta( minutes=60 ): + if delta.days > 0: + last_updated[job.id] = '%s hours' % ( delta.days * 24 + int( delta.seconds / 60 / 60 ) ) + elif delta > timedelta( minutes=59 ): last_updated[job.id] = '%s hours' % int( delta.seconds / 60 / 60 ) else: last_updated[job.id] = '%s minutes' % int( delta.seconds / 60 ) 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.