openstack/fuel-web
Code Issues Proposed changes

Properly display progress and name of infinite tasks

Browse Source 
Closes-Bug: #1474474
Related to blueprint reduced-footprint

Change-Id: I16e64de887d1ba4eeb493abccd3c47c6a2369221
This commit is contained in:
Vitaly Kramskikh 2015-07-14 20:05:47 +03:00
parent e4e19e41a5
commit 941c2c47c3
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='col-xs-6 col-md-3'>
<div className='deploy-box pull-right'> <div className='deploy-box pull-right'>
{task ? ( {task ? (
<div className={'deploy-process ' + taskName}> <div className={'deploy-process ' + taskName} key={taskName}>
<div className='progress'> <div className='progress'>
<div <div
className={utils.classNames({ className={utils.classNames({
@ -409,10 +409,10 @@ function($, _, i18n, Backbone, React, utils, models, dispatcher, componentMixins
'progress-bar-warning': infiniteTask, 'progress-bar-warning': infiniteTask,
'progress-bar-success': !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>
<div className='deploy-status'>{i18n('cluster_page.' + taskName, {defaultValue: ''})}</div>
</div> </div>
{stoppableTask && {stoppableTask &&
<button <button