diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 4ef363a1f32..dee22fb06f2 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -23,7 +23,6 @@ class Configuration( object ): 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 --git a/lib/galaxy/web/base/controller.py b/lib/galaxy/web/base/controller.py index 04ab71b493a..534124e2131 100644 --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -16,8 +16,6 @@ class BaseController( object ): """ Base class for Galaxy web application controllers. """ - - beta = False def __init__( self, app ): """Initialize an interface for application 'app'""" diff --git a/lib/galaxy/web/buildapp.py b/lib/galaxy/web/buildapp.py index c30559b25cb..ea3bcf713ef 100644 --- a/lib/galaxy/web/buildapp.py +++ b/lib/galaxy/web/buildapp.py @@ -41,8 +41,7 @@ def add_controllers( webapp, app ): 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 --git a/lib/galaxy/web/controllers/workflow.py b/lib/galaxy/web/controllers/workflow.py index b33a051f350..9f7af993014 100644 --- a/lib/galaxy/web/controllers/workflow.py +++ b/lib/galaxy/web/controllers/workflow.py @@ -13,7 +13,6 @@ from galaxy.workflow.modules import * from galaxy.model.mapping import desc class WorkflowController( BaseController ): - beta = True @web.expose @web.require_login( "use Galaxy workflows" ) diff --git a/lib/galaxy/webapps/reports/base/controller.py b/lib/galaxy/webapps/reports/base/controller.py index 0452d2d429a..9a602e5bcc9 100644 --- a/lib/galaxy/webapps/reports/base/controller.py +++ b/lib/galaxy/webapps/reports/base/controller.py @@ -8,7 +8,6 @@ log = logging.getLogger( __name__ ) 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 --git a/lib/galaxy/webapps/reports/buildapp.py b/lib/galaxy/webapps/reports/buildapp.py index dc2abd1ef6a..76a1855e5bb 100644 --- a/lib/galaxy/webapps/reports/buildapp.py +++ b/lib/galaxy/webapps/reports/buildapp.py @@ -40,7 +40,6 @@ def add_controllers( webapp, app ): 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 --git a/templates/history/options.mako b/templates/history/options.mako index 4faa967742d..ac79fe10e7e 100644 --- a/templates/history/options.mako +++ b/templates/history/options.mako @@ -16,9 +16,7 @@ %if len( history.active_datasets ) > 0:
  • Create a new empty history
  • %endif - %if app.config.enable_beta_features:
  • Construct workflow from the current history
  • - %endif
  • Share current history %endif
  • Delete current history diff --git a/templates/root/tool_menu.mako b/templates/root/tool_menu.mako index 431b2fffc43..c2d77210905 100644 --- a/templates/root/tool_menu.mako +++ b/templates/root/tool_menu.mako @@ -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: -
    -
    -
    - Workflow (beta) -
    -
    -
    -
    - Manage workflows -
    - %if t.user: - %for m in t.user.stored_workflow_menu_entries: - - %endfor - %endif -
    -
    -%endif +
    +
    +
    + Workflow (beta) +
    +
    +
    +
    + Manage workflows +
    + %if t.user: + %for m in t.user.stored_workflow_menu_entries: + + %endfor + %endif +
    +