1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/2675699dea93/ changeset: 2675699dea93 user: natefoo date: 2011-09-23 17:01:37 summary: BaseController -> BaseUIController fixes for webapps. affected #: 14 files (-1 bytes) --- a/lib/galaxy/webapps/community/buildapp.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/community/buildapp.py Fri Sep 23 11:01:37 2011 -0400 @@ -20,12 +20,12 @@ log = logging.getLogger( __name__ ) -def add_controllers( webapp, app ): +def add_ui_controllers( webapp, app ): """ Search for controllers in the 'galaxy.webapps.controllers' module and add them to the webapp. """ - from galaxy.web.base.controller import BaseController + from galaxy.web.base.controller import BaseUIController from galaxy.web.base.controller import ControllerUnavailable import galaxy.webapps.community.controllers controller_dir = galaxy.webapps.community.controllers.__path__[0] @@ -39,8 +39,8 @@ # Look for a controller inside the modules for key in dir( module ): T = getattr( module, key ) - if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - webapp.add_controller( name, T( app ) ) + if isclass( T ) and T is not BaseUIController and issubclass( T, BaseUIController ): + webapp.add_ui_controller( name, T( app ) ) import galaxy.web.controllers controller_dir = galaxy.web.controllers.__path__[0] for fname in os.listdir( controller_dir ): @@ -54,8 +54,8 @@ # Look for a controller inside the modules for key in dir( module ): T = getattr( module, key ) - if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - webapp.add_controller( name, T( app ) ) + if isclass( T ) and T is not BaseUIController and issubclass( T, BaseUIController ): + webapp.add_ui_controller( name, T( app ) ) def app_factory( global_conf, **kwargs ): """Return a wsgi application serving the root object""" @@ -73,7 +73,7 @@ atexit.register( app.shutdown ) # Create the universe WSGI application webapp = galaxy.web.framework.WebApplication( app, session_cookie='galaxycommunitysession' ) - add_controllers( webapp, app ) + add_ui_controllers( webapp, app ) webapp.add_route( '/:controller/:action', action='index' ) webapp.add_route( '/:action', controller='repository', action='index' ) webapp.add_route( '/repos/*path_info', controller='hg', action='handle_request', path_info='/' ) --- a/lib/galaxy/webapps/community/controllers/admin.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/admin.py Fri Sep 23 11:01:37 2011 -0400 @@ -380,7 +380,7 @@ return trans.sa_session.query( self.model_class ) \ .join( model.Repository.table ) -class AdminController( BaseController, Admin ): +class AdminController( BaseUIController, Admin ): user_list_grid = UserListGrid() role_list_grid = RoleListGrid() --- a/lib/galaxy/webapps/community/controllers/hg.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/hg.py Fri Sep 23 11:01:37 2011 -0400 @@ -5,7 +5,7 @@ log = logging.getLogger(__name__) -class HgController( BaseController ): +class HgController( BaseUIController ): @web.expose def handle_request( self, trans, **kwd ): # The os command that results in this method being called will look something like --- a/lib/galaxy/webapps/community/controllers/repository.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Fri Sep 23 11:01:37 2011 -0400 @@ -220,7 +220,7 @@ .join( model.RepositoryMetadata.table ) \ .join( model.User.table ) -class RepositoryController( BaseController, ItemRatings ): +class RepositoryController( BaseUIController, ItemRatings ): downloadable_repository_list_grid = DownloadableRepositoryListGrid() repository_list_grid = RepositoryListGrid() --- a/lib/galaxy/webapps/community/controllers/upload.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/upload.py Fri Sep 23 11:01:37 2011 -0400 @@ -14,7 +14,7 @@ class UploadError( Exception ): pass -class UploadController( BaseController ): +class UploadController( BaseUIController ): @web.expose @web.require_login( 'upload', use_panels=True, webapp='community' ) def upload( self, trans, **kwd ): @@ -313,4 +313,4 @@ message = "Uploaded archives cannot contain hgrc files." return False, message return True, '' - \ No newline at end of file + --- a/lib/galaxy/webapps/demo_sequencer/buildapp.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/demo_sequencer/buildapp.py Fri Sep 23 11:01:37 2011 -0400 @@ -18,12 +18,12 @@ import config import galaxy.webapps.demo_sequencer.framework -def add_controllers( webapp, app ): +def add_ui_controllers( webapp, app ): """ Search for controllers in the 'galaxy.webapps.demo_sequencer.controllers' directory and add them to the webapp. """ - from galaxy.web.base.controller import BaseController + from galaxy.web.base.controller import BaseUIController from galaxy.web.base.controller import ControllerUnavailable import galaxy.webapps.demo_sequencer.controllers controller_dir = galaxy.webapps.demo_sequencer.controllers.__path__[0] @@ -37,8 +37,8 @@ # Look for a controller inside the modules for key in dir( module ): T = getattr( module, key ) - if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - webapp.add_controller( name, T( app ) ) + if isclass( T ) and T is not BaseUIController and issubclass( T, BaseUIController ): + webapp.add_ui_controller( name, T( app ) ) def app_factory( global_conf, **kwargs ): """Return a wsgi application serving the root object""" @@ -56,7 +56,7 @@ atexit.register( app.shutdown ) # Create the universe WSGI application webapp = galaxy.webapps.demo_sequencer.framework.WebApplication( app, session_cookie='galaxydemo_sequencersession' ) - add_controllers( webapp, app ) + add_ui_controllers( webapp, app ) # These two routes handle our simple needs at the moment webapp.add_route( '/:controller/:action', action='index' ) webapp.add_route( '/:action', controller='common', action='index' ) --- a/lib/galaxy/webapps/demo_sequencer/controllers/common.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/demo_sequencer/controllers/common.py Fri Sep 23 11:01:37 2011 -0400 @@ -8,7 +8,7 @@ import logging log = logging.getLogger( __name__ ) -class CommonController( BaseController ): +class CommonController( BaseUIController ): @web.expose def index( self, trans, **kwd ): redirect_action = util.restore_text( kwd.get( 'redirect_action', '' ) ) --- a/lib/galaxy/webapps/reports/buildapp.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/buildapp.py Fri Sep 23 11:01:37 2011 -0400 @@ -20,12 +20,12 @@ import galaxy.model.mapping import galaxy.web.framework -def add_controllers( webapp, app ): +def add_ui_controllers( webapp, app ): """ Search for controllers in the 'galaxy.webapps.controllers' module and add them to the webapp. """ - from galaxy.web.base.controller import BaseController + from galaxy.web.base.controller import BaseUIController from galaxy.web.base.controller import ControllerUnavailable import galaxy.webapps.reports.controllers controller_dir = galaxy.webapps.reports.controllers.__path__[0] @@ -39,8 +39,8 @@ # Look for a controller inside the modules for key in dir( module ): T = getattr( module, key ) - if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - webapp.add_controller( name, T( app ) ) + if isclass( T ) and T is not BaseUIController and issubclass( T, BaseUIController ): + webapp.add_ui_controller( name, T( app ) ) def app_factory( global_conf, **kwargs ): """Return a wsgi application serving the root object""" @@ -53,7 +53,7 @@ atexit.register( app.shutdown ) # Create the universe WSGI application webapp = galaxy.web.framework.WebApplication( app, session_cookie='galaxyreportssession' ) - add_controllers( webapp, app ) + add_ui_controllers( webapp, app ) # These two routes handle our simple needs at the moment webapp.add_route( '/:controller/:action', controller="root", action='index' ) webapp.add_route( '/:action', controller='root', action='index' ) --- a/lib/galaxy/webapps/reports/controllers/jobs.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/jobs.py Fri Sep 23 11:01:37 2011 -0400 @@ -117,7 +117,7 @@ .join( model.User ) \ .enable_eagerloads( False ) -class Jobs( BaseController ): +class Jobs( BaseUIController ): specified_date_list_grid = SpecifiedDateListGrid() --- a/lib/galaxy/webapps/reports/controllers/root.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/root.py Fri Sep 23 11:01:37 2011 -0400 @@ -2,7 +2,7 @@ import logging log = logging.getLogger( __name__ ) -class Report( BaseController ): +class Report( BaseUIController ): @web.expose def index( self, trans, **kwd ): return trans.fill_template( '/webapps/reports/index.mako' ) --- a/lib/galaxy/webapps/reports/controllers/sample_tracking.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/sample_tracking.py Fri Sep 23 11:01:37 2011 -0400 @@ -94,7 +94,7 @@ .join( model.User ) \ .enable_eagerloads( False ) -class SampleTracking( BaseController ): +class SampleTracking( BaseUIController ): specified_date_list_grid = SpecifiedDateListGrid() --- a/lib/galaxy/webapps/reports/controllers/system.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/system.py Fri Sep 23 11:01:37 2011 -0400 @@ -6,7 +6,7 @@ import logging log = logging.getLogger( __name__ ) -class System( BaseController ): +class System( BaseUIController ): @web.expose def index( self, trans, **kwd ): params = util.Params( kwd ) --- a/lib/galaxy/webapps/reports/controllers/users.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/users.py Fri Sep 23 11:01:37 2011 -0400 @@ -10,7 +10,7 @@ import logging log = logging.getLogger( __name__ ) -class Users( BaseController ): +class Users( BaseUIController ): @web.expose def registered_users( self, trans, **kwd ): message = util.restore_text( kwd.get( 'message', '' ) ) --- a/lib/galaxy/webapps/reports/controllers/workflows.py Fri Sep 23 10:38:27 2011 -0400 +++ b/lib/galaxy/webapps/reports/controllers/workflows.py Fri Sep 23 11:01:37 2011 -0400 @@ -94,7 +94,7 @@ .join( model.User ) \ .enable_eagerloads( False ) -class Workflows( BaseController ): +class Workflows( BaseUIController ): specified_date_list_grid = SpecifiedDateListGrid() 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.