openstack/fuel-web
Code Issues Proposed changes

Merge "Properly display progress and name of infinite tasks"

Browse Source
This commit is contained in:
Jenkins 2015-07-15 08:07:10 +00:00 committed by Gerrit Code Review
commit d55bd2ffce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nailgun/static/views/cluster_page.jsx
View File

@ -401,7 +401,7 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
<div className='col-xs-6 col-md-3'>
<div className='deploy-box pull-right'>
{task ? (
<div className={'deploy-process ' + taskName}>
<div className={'deploy-process ' + taskName} key={taskName}>
<div className='progress'>
<div
className={utils.classNames({
@ -409,10 +409,10 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
'progress-bar-warning': infiniteTask,
'progress-bar-success': !infiniteTask
})}
style={{width: (taskProgress > 3 ? taskProgress : 3) + '%'}}
style={{width: (infiniteTask ? 100 : taskProgress > 3 ? taskProgress : 3) + '%'}}
>
{i18n('cluster_page.' + taskName, {defaultValue: ''})}
</div>
<div className='deploy-status'>{i18n('cluster_page.' + taskName, {defaultValue: ''})}</div>
</div>
{stoppableTask &&
<button