Disabled the two "edit pool" links I missed in my previous patch. Thanks to Scott for spotting them out.
From: Tomas Sedovic tsedovic@redhat.com
https://bugzilla.redhat.com/show_bug.cgi?id=640498 https://bugzilla.redhat.com/show_bug.cgi?id=643865
Temporarily disabling the pool delete and edit buttons. --- src/app/views/instance/index.haml | 2 +- src/app/views/pools/index.haml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/app/views/instance/index.haml b/src/app/views/instance/index.haml index 8bca1ee..3a94c5e 100644 --- a/src/app/views/instance/index.haml +++ b/src/app/views/instance/index.haml @@ -69,7 +69,7 @@ - @pools.each do |pool| %tr %td - =link_to pool.name, pool_url(pool.id) + = pool.name %td N/A %td =((pool.quota.maximum_running_instances || 0)/100)*pool.quota.total_instances diff --git a/src/app/views/pools/index.haml b/src/app/views/pools/index.haml index f713d70..f05579e 100644 --- a/src/app/views/pools/index.haml +++ b/src/app/views/pools/index.haml @@ -3,12 +3,17 @@ %dl %dt Pools + / NOTE the 'edit' and 'delete' buttons are temporarily disabled. + / They are replaced by generic <button> tags with no functionality. + / Once we suport editing and deleting pools, we should switch it back. %dd.edit %span - = submit_tag "edit", :class => "submit linkbutton" + /= submit_tag "edit", :class => "submit linkbutton" + %button.submit.linkbutton{ :disabled => 'disabled'} edit %dd.delete %span - = submit_tag "delete", :class => "submit linkbutton" + /= submit_tag "delete", :class => "submit linkbutton" + %button.submit.linkbutton{ :disabled => 'disabled'} delete %dd.add %span =link_to 'new pool', :action => :new, :class => "button" @@ -21,7 +26,7 @@ %td - is_first_pool = (pool == @pools.first) %input{:checked => is_first_pool, :name => "pool_checkbox", :type => "checkbox", :value => pool.id, :id => "pool_checkbox_#{pool.id}" } - =link_to pool.name, {:action => 'edit', :id => pool.id} + = pool.name %td =((pool.quota.maximum_running_instances || 0)/100)*pool.quota.total_instances ='%'
tsedovic@redhat.com wrote:
From: Tomas Sedovic tsedovic@redhat.com
https://bugzilla.redhat.com/show_bug.cgi?id=640498 https://bugzilla.redhat.com/show_bug.cgi?id=643865
Temporarily disabling the pool delete and edit buttons.
src/app/views/instance/index.haml | 2 +- src/app/views/pools/index.haml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-)
ACK,
Go ahead and push it now.
Scott
deltacloud-devel@lists.fedorahosted.org