ACK'd and pushed. Mainn
----- Original Message ----- > From: "Scott Seago" <[email protected]> > To: [email protected] > Cc: "Scott Seago" <[email protected]> > Sent: Wednesday, September 5, 2012 2:24:28 PM > Subject: [PATCH conductor] bug 805134: Fix quota usage message on pools page. > > https://bugzilla.redhat.com/show_bug.cgi?id=805134 > > Quota was showing up as 'x of y' where x is instances in use, and y > was available instances. > This was incorrect, since "of y" implies that y is the total quota, > not the free space. > --- > src/app/views/pools/_scoreboard_show.html.haml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/app/views/pools/_scoreboard_show.html.haml > b/src/app/views/pools/_scoreboard_show.html.haml > index 3693eeb..f858c0c 100644 > --- a/src/app/views/pools/_scoreboard_show.html.haml > +++ b/src/app/views/pools/_scoreboard_show.html.haml > @@ -29,5 +29,5 @@ > %dd.fraction.instance > %span.part{:title => > t('pools.scoreboard.running_instances_quota')}= > @statistics[:used_quota] > %span.divider.label.small.caps of > - %span.total{:title => > t('pools.scoreboard.total_available_instances')}= > @statistics[:available_quota] or '∞'.html_safe > + %span.total{:title => > t('pools.scoreboard.total_available_instances')}= > @pool.quota.maximum_running_instances or '∞'.html_safe > -# TODO: Implement alerts and updates > -- > 1.7.11.4 > >
