2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ed0e437ce0d6/ Changeset: ed0e437ce0d6 User: dannon Date: 2013-10-25 06:43:55 Summary: Missing tempfile import in dataproviders/external. Affected #: 1 file diff -r 5a259fa8aabb4d977c5ed091d1658b9674d0e67c -r ed0e437ce0d6663ce247161a32287e2de977d226 lib/galaxy/datatypes/dataproviders/external.py --- a/lib/galaxy/datatypes/dataproviders/external.py +++ b/lib/galaxy/datatypes/dataproviders/external.py @@ -3,12 +3,12 @@ or not in a file. """ +import base +import gzip +import line import subprocess +import tempfile import urllib, urllib2 -import gzip - -import base -import line _TODO = """ YAGNI: ftp, image, cryptos, sockets https://bitbucket.org/galaxy/galaxy-central/commits/d57971b60b8d/ Changeset: d57971b60b8d User: dannon Date: 2013-10-25 06:57:53 Summary: Bugfix/cleanup in reports/workflows module -- was using workflow_id instead of stored_workflow_id Affected #: 1 file diff -r ed0e437ce0d6663ce247161a32287e2de977d226 -r d57971b60b8d907c33bf4dfc1bba2432baaf96e9 lib/galaxy/webapps/reports/controllers/workflows.py --- a/lib/galaxy/webapps/reports/controllers/workflows.py +++ b/lib/galaxy/webapps/reports/controllers/workflows.py @@ -1,34 +1,40 @@ -import calendar, operator, os, socket -from datetime import datetime, date, timedelta -from time import mktime, strftime, localtime +import calendar +from datetime import date, timedelta +from galaxy import eggs +from galaxy import model, util +from galaxy.model.orm import and_ from galaxy.web.base.controller import BaseUIController, web -from galaxy import model, util -from galaxy.web.framework.helpers import time_ago, iff, grids -from galaxy.model.orm import and_, not_, or_ -import pkg_resources -pkg_resources.require( "SQLAlchemy >= 0.4" ) +from galaxy.web.framework.helpers import grids +eggs.require( "SQLAlchemy >= 0.4" ) import sqlalchemy as sa + import logging log = logging.getLogger( __name__ ) + class SpecifiedDateListGrid( grids.Grid ): + class WorkflowNameColumn( grids.TextColumn ): def get_value( self, trans, grid, stored_workflow ): return stored_workflow.name + class CreateTimeColumn( grids.DateTimeColumn ): def get_value( self, trans, grid, stored_workflow ): return stored_workflow.create_time + class UserColumn( grids.TextColumn ): def get_value( self, trans, grid, stored_workflow ): if stored_workflow.user: return stored_workflow.user.email return 'unknown' + class EmailColumn( grids.GridColumn ): def filter( self, trans, user, query, column_filter ): if column_filter == 'All': return query return query.filter( and_( model.StoredWorkflow.table.c.user_id == model.User.table.c.id, model.User.table.c.email == column_filter ) ) + class SpecifiedDateColumn( grids.GridColumn ): def filter( self, trans, user, query, column_filter ): if column_filter == 'All': @@ -94,6 +100,7 @@ .join( model.User ) \ .enable_eagerloads( False ) + class Workflows( BaseUIController ): specified_date_list_grid = SpecifiedDateListGrid() @@ -120,7 +127,7 @@ **kwd ) ) elif operation == "user_per_month": stored_workflow_id = kwd.get( 'id', None ) - workflow = get_workflow( trans, workflow_id ) + workflow = get_workflow( trans, stored_workflow_id ) if workflow.user: kwd[ 'email' ] = workflow.user.email else: @@ -129,9 +136,9 @@ action='user_per_month', **kwd ) ) return self.specified_date_list_grid( trans, **kwd ) + @web.expose def per_month_all( self, trans, **kwd ): - params = util.Params( kwd ) message = '' q = sa.select( ( sa.func.date_trunc( 'month', sa.func.date( model.StoredWorkflow.table.c.create_time ) ).label( 'date' ),sa.func.count( model.StoredWorkflow.table.c.id ).label( 'total_workflows' ) ), from_obj = [ sa.outerjoin( model.StoredWorkflow.table, model.User.table ) ], @@ -146,9 +153,9 @@ return trans.fill_template( '/webapps/reports/workflows_per_month_all.mako', workflows=workflows, message=message ) + @web.expose def per_user( self, trans, **kwd ): - params = util.Params( kwd ) message = '' workflows = [] q = sa.select( ( model.User.table.c.email.label( 'user_email' ), @@ -160,6 +167,7 @@ workflows.append( ( row.user_email, row.total_workflows ) ) return trans.fill_template( '/webapps/reports/workflows_per_user.mako', workflows=workflows, message=message ) + @web.expose def user_per_month( self, trans, **kwd ): params = util.Params( kwd ) 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.