From pblaho at redhat.com Wed Aug 19 15:23:36 2015 Content-Type: multipart/mixed; boundary="===============1671981984051254922==" MIME-Version: 1.0 From: Petr Blaho To: aeolus-devel at lists.fedorahosted.org Subject: Re: [PATCH conductor] BZ785006 Clicking pool and deployment links in list view, leads to appropriate list view Date: Thu, 02 Feb 2012 16:02:35 +0100 Message-ID: <4171450.Gtg3MA1Ohz@dhcp-30-137.brq.redhat.com> In-Reply-To: 1328178562-20588-1-git-send-email-jtomasek@redhat.com --===============1671981984051254922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Thursday, February 02, 2012 11:29:22 AM jtomasek(a)redhat.com wrote: > From: Jiri Tomasek > = > --- > src/app/views/deployments/_list.html.haml | 8 ++++---- > src/app/views/pools/_list.html.haml | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > = > diff --git a/src/app/views/deployments/_list.html.haml b/src/app/views/de= ployments/_list.html.haml > index d2177ac..b66f8fc 100644 > --- a/src/app/views/deployments/_list.html.haml > +++ b/src/app/views/deployments/_list.html.haml > @@ -31,12 +31,12 @@ > - selected =3D params[:select] =3D=3D 'all' > =3D check_box_tag "deployments_selected[]", deployment.id, selecte= d, :id =3D> "deployment_checkbox_#{deployment.id}" > %td{:class =3D> 'alert'}=3D deployment.failed_instances.present? ? i= mage_tag("sb_icon_instance_failure.png") : "" > - %td=3D link_to(deployment.name, deployment) > + %td=3D link_to(deployment.name, deployment_path(deployment, :view = =3D> :filter)) > %td=3D deployment.created_at > %td=3D deployment.deployable_xml.name > %td=3D deployment.deployment_state > %td{:class =3D> 'center'}=3D deployment.instances.count > - %td=3D link_to deployment.pool.name, pool_path(deployment.pool) > + %td=3D link_to deployment.pool.name, pool_path(deployment.pool, :vie= w =3D> :filter) > %td=3D owner_name(deployment) > %td=3D link_to(deployment.provider.provider_type.name, deployment.pr= ovider) if deployment.provider > :javascript > @@ -55,12 +55,12 @@ > #{image_tag("sb_icon_instance_failure.png")} > {{/if}} > > - ${name} > + :filter)= .sub('replace_id', '${id}')}">${name} > ${created_at} > ${deployable_xml_name} > ${deployment_state} > ${instances_count} > - ${pool.name} > + :filter).sub('= replace_id', '${pool.id}')}">${pool.name} > ${owner} > > {{if provider}} > diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_l= ist.html.haml > index adc0304..8c53d35 100644 > --- a/src/app/views/pools/_list.html.haml > +++ b/src/app/views/pools/_list.html.haml > @@ -27,7 +27,7 @@ > %td{:class =3D> 'checkbox'} > %input{:name =3D> "pools_selected[]", :type =3D> "checkbox", :valu= e =3D> pool.id, :id =3D> "pool_checkbox_#{pool.id}" } > %td{:class =3D> 'alert'}=3D (@statistics[:instances_failed] & pool.i= nstances).present? ? image_tag("sb_icon_instance_failure.png") : "" > - %td=3D link_to(pool.name, pool) > + %td=3D link_to(pool.name, pool_path(pool, :view =3D> :filter)) > %td{:class =3D> 'center'}=3D pool.deployments.count > %td{:class =3D> 'center'}=3D pool.statistics[:total_instances] > %td{:class =3D> 'center'}=3D pool.statistics[:instances_pending] > @@ -47,7 +47,7 @@ > #{image_tag("sb_icon_instance_failure.png")} > {{/if}} > > - ${name} > + :filter).sub('= replace_id', '${id}')}">${name} > ${deployments_count} > ${statistics.total_instances} > ${statistics.instances_pending} > = Works for me, ACK. -- = With regards Petr Blaho --===============1671981984051254922==--