1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/c3ac1fae1a29/ changeset: c3ac1fae1a29 user: dannon date: 2012-11-16 15:40:20 summary: Add paused dataset state for new history panel. Still needs icon and complete info text. affected #: 2 files
diff -r 4212a41ba5ee1f2a45f4d5f84c110808b167c87a -r c3ac1fae1a290c4012f2e7f3d7a87126622b0fc3 static/scripts/mvc/dataset/hda-base.js --- a/static/scripts/mvc/dataset/hda-base.js +++ b/static/scripts/mvc/dataset/hda-base.js @@ -328,34 +328,37 @@ switch( this.model.get( 'state' ) ){ case HistoryDatasetAssociation.STATES.NOT_VIEWABLE : this._render_body_not_viewable( body ); - break; + break; case HistoryDatasetAssociation.STATES.UPLOAD : - this._render_body_uploading( body ); - break; + this._render_body_uploading( body ); + break; + case HistoryDatasetAssociation.STATES.PAUSED: + this._render_body_paused( body ); + break; case HistoryDatasetAssociation.STATES.QUEUED : - this._render_body_queued( body ); - break; + this._render_body_queued( body ); + break; case HistoryDatasetAssociation.STATES.RUNNING : - this._render_body_running( body ); - break; + this._render_body_running( body ); + break; case HistoryDatasetAssociation.STATES.ERROR : - this._render_body_error( body ); - break; + this._render_body_error( body ); + break; case HistoryDatasetAssociation.STATES.DISCARDED : - this._render_body_discarded( body ); - break; + this._render_body_discarded( body ); + break; case HistoryDatasetAssociation.STATES.SETTING_METADATA : - this._render_body_setting_metadata( body ); - break; + this._render_body_setting_metadata( body ); + break; case HistoryDatasetAssociation.STATES.EMPTY : - this._render_body_empty( body ); - break; + this._render_body_empty( body ); + break; case HistoryDatasetAssociation.STATES.FAILED_METADATA : - this._render_body_failed_metadata( body ); - break; + this._render_body_failed_metadata( body ); + break; case HistoryDatasetAssociation.STATES.OK : - this._render_body_ok( body ); - break; + this._render_body_ok( body ); + break; default: //??: no body? body.append( $( '<div>Error: unknown dataset state "' + state + '".</div>' ) ); @@ -392,6 +395,14 @@ parent.append( $( '<div>' + _l( 'Job is waiting to run' ) + '.</div>' ) ); parent.append( this._render_primaryActionButtons( this.defaultPrimaryActionButtonRenderers )); }, + + /** Render an HDA whose job is paused. + * @param {jQuery} parent DOM to which to append this body + */ + _render_body_paused: function( parent ){ + parent.append( $( '<div>' + _l( 'Job is paused. Use the history menu to unpause' ) + '.</div>' ) ); + parent.append( this._render_primaryActionButtons( this.defaultPrimaryActionButtonRenderers )); + },
/** Render an HDA whose job is running. * @param {jQuery} parent DOM to which to append this body
diff -r 4212a41ba5ee1f2a45f4d5f84c110808b167c87a -r c3ac1fae1a290c4012f2e7f3d7a87126622b0fc3 static/scripts/mvc/dataset/hda-model.js --- a/static/scripts/mvc/dataset/hda-model.js +++ b/static/scripts/mvc/dataset/hda-model.js @@ -164,6 +164,8 @@ UPLOAD : 'upload', /** the job that will produce the dataset queued in the runner */ QUEUED : 'queued', + /** the job that will produce the dataset paused */ + PAUSED : 'paused', /** the job that will produce the dataset is running */ RUNNING : 'running', /** metadata for the dataset is being discovered/set */
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.