details: http://www.bx.psu.edu/hg/galaxy/rev/447c74d98fe5 changeset: 1528:447c74d98fe5 user: Greg Von Kuster greg@bx.psu.edu date: Wed Sep 24 15:05:38 2008 -0400 description: Eliminate enable_beta_features ( and the concept of 'beta' from the controllers ).
8 file(s) affected in this change:
lib/galaxy/config.py lib/galaxy/web/base/controller.py lib/galaxy/web/buildapp.py lib/galaxy/web/controllers/workflow.py lib/galaxy/webapps/reports/base/controller.py lib/galaxy/webapps/reports/buildapp.py templates/history/options.mako templates/root/tool_menu.mako
diffs (133 lines):
diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/config.py --- a/lib/galaxy/config.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/config.py Wed Sep 24 15:05:38 2008 -0400 @@ -23,7 +23,6 @@ def __init__( self, **kwargs ): self.config_dict = kwargs self.root = kwargs.get( 'root_dir', '.' ) - self.enable_beta_features = kwargs.get( "enable_beta_features", False ) # Database related configuration self.database = resolve_path( kwargs.get( "database_file", "database/universe.d" ), self.root ) self.database_connection = kwargs.get( "database_connection", False ) diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/web/base/controller.py Wed Sep 24 15:05:38 2008 -0400 @@ -16,8 +16,6 @@ """ Base class for Galaxy web application controllers. """ - - beta = False
def __init__( self, app ): """Initialize an interface for application 'app'""" diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/web/buildapp.py --- a/lib/galaxy/web/buildapp.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/web/buildapp.py Wed Sep 24 15:05:38 2008 -0400 @@ -41,8 +41,7 @@ for key in dir( module ): T = getattr( module, key ) if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - if app.config.enable_beta_features or not ( T.beta ): - webapp.add_controller( name, T( app ) ) + webapp.add_controller( name, T( app ) )
def app_factory( global_conf, **kwargs ): """ diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/web/controllers/workflow.py Wed Sep 24 15:05:38 2008 -0400 @@ -13,7 +13,6 @@ from galaxy.model.mapping import desc
class WorkflowController( BaseController ): - beta = True
@web.expose @web.require_login( "use Galaxy workflows" ) diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/webapps/reports/base/controller.py --- a/lib/galaxy/webapps/reports/base/controller.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/webapps/reports/base/controller.py Wed Sep 24 15:05:38 2008 -0400 @@ -8,7 +8,6 @@
class BaseController( object ): """Base class for Galaxy webapp application controllers.""" - beta = False def __init__( self, app ): """Initialize an interface for application 'app'""" self.app = app \ No newline at end of file diff -r b6420d2f247c -r 447c74d98fe5 lib/galaxy/webapps/reports/buildapp.py --- a/lib/galaxy/webapps/reports/buildapp.py Wed Sep 24 13:52:01 2008 -0400 +++ b/lib/galaxy/webapps/reports/buildapp.py Wed Sep 24 15:05:38 2008 -0400 @@ -40,7 +40,6 @@ for key in dir( module ): T = getattr( module, key ) if isclass( T ) and T is not BaseController and issubclass( T, BaseController ): - #if app.config.enable_beta_features or not ( T.beta ): webapp.add_controller( name, T( app ) )
def app_factory( global_conf, **kwargs ): diff -r b6420d2f247c -r 447c74d98fe5 templates/history/options.mako --- a/templates/history/options.mako Wed Sep 24 13:52:01 2008 -0400 +++ b/templates/history/options.mako Wed Sep 24 15:05:38 2008 -0400 @@ -16,9 +16,7 @@ %if len( history.active_datasets ) > 0: <li><a href="${h.url_for('/history_new')}">Create</a> a new empty history</li> %endif - %if app.config.enable_beta_features: <li><a href="${h.url_for( controller='workflow', action='build_from_current_history' )}">Construct workflow</a> from the current history</li> - %endif <li><a href="${h.url_for( action='history_share' )}" target="galaxy_main">Share</a> current history</div> %endif <li><a href="${h.url_for( action='history_delete', id=history.id )}" confirm="Are you sure you want to delete the current history?">Delete</a> current history</div> diff -r b6420d2f247c -r 447c74d98fe5 templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako Wed Sep 24 13:52:01 2008 -0400 +++ b/templates/root/tool_menu.mako Wed Sep 24 15:05:38 2008 -0400 @@ -82,27 +82,25 @@ ## at least some workflows will appear here (the user should be able to ## configure which of their stored workflows appear in the tools menu).
-%if app.config.enable_beta_features: - <div class="toolSectionPad"></div> - <div class="toolSectionPad"></div> - <div class="toolSectionTitle" id="title_XXinternalXXworkflow"> - <span>Workflow <i>(beta)</i></span> - </div> - <div id="XXinternalXXworkflow" class="toolSectionBody"> - <div class="toolSectionBg"> - <div class="toolTitle"> - <a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">Manage</a> workflows - </div> - %if t.user: - %for m in t.user.stored_workflow_menu_entries: - <div class="toolTitle"> - <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${m.stored_workflow.name}</a> - </div> - %endfor - %endif - </div> - </div> -%endif +<div class="toolSectionPad"></div> +<div class="toolSectionPad"></div> +<div class="toolSectionTitle" id="title_XXinternalXXworkflow"> + <span>Workflow <i>(beta)</i></span> +</div> +<div id="XXinternalXXworkflow" class="toolSectionBody"> + <div class="toolSectionBg"> + <div class="toolTitle"> + <a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">Manage</a> workflows + </div> + %if t.user: + %for m in t.user.stored_workflow_menu_entries: + <div class="toolTitle"> + <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${m.stored_workflow.name}</a> + </div> + %endfor + %endif + </div> +</div>
</div>