On Fri, Jul 01, 2011 at 11:29:31AM -0500, Steve Linabery wrote:
Since the uptime attribute is not currently accurate/reliable, remove
it from the UI until such time as it is.
Another temp commit message
Can you remove that? ^^^
---
src/app/controllers/pools_controller.rb | 1 -
src/app/views/deployments/_deployment.haml | 2 --
src/app/views/deployments/_filter_view.haml | 2 --
src/app/views/deployments/_filter_view_show.haml | 4 +---
src/app/views/deployments/_operation.haml | 2 --
src/app/views/deployments/_pretty_view_show.haml | 3 ---
src/app/views/instances/_properties.haml | 3 ---
src/app/views/pools/_deployments.haml | 3 ---
8 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 9e3b060..14788a8 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -228,7 +228,6 @@ class PoolsController < ApplicationController
{ :name => '', :sortable => false },
{ :name => t("deployments.deployment_name"), :sortable => false
},
{ :name => t("deployables.index.base_deployable"), :sortable =>
false },
- { :name => t("uptime"), :sortable => false },
{ :name => t("instances.instances"), :sortable => false },
{ :name => t("providers.provider"), :sortable => false }
]
diff --git a/src/app/views/deployments/_deployment.haml
b/src/app/views/deployments/_deployment.haml
index 1815fda..03cfbdc 100644
--- a/src/app/views/deployments/_deployment.haml
+++ b/src/app/views/deployments/_deployment.haml
@@ -3,8 +3,6 @@
= link_to(deployment.name, deployment)
%ul
%li
- = count_uptime(deployment.created_at)
- %li
= deployment.instances.count
Instances
%p
diff --git a/src/app/views/deployments/_filter_view.haml
b/src/app/views/deployments/_filter_view.haml
index 9812547..e805263 100644
--- a/src/app/views/deployments/_filter_view.haml
+++ b/src/app/views/deployments/_filter_view.haml
@@ -9,8 +9,6 @@
%td
= deployment.deployable_xml.name
%td
- = count_uptime(deployment.created_at)
- %td
= deployment.instances.count
%td
= link_to(deployment.provider.provider_type.name, deployment.provider) if
deployment.provider
diff --git a/src/app/views/deployments/_filter_view_show.haml
b/src/app/views/deployments/_filter_view_show.haml
index 642e1ea..1aec6ab 100644
--- a/src/app/views/deployments/_filter_view_show.haml
+++ b/src/app/views/deployments/_filter_view_show.haml
@@ -1,6 +1,6 @@
%header
%h2 Instances
-= filter_table([{:name =>''}, {:name => ''}, {:name =>
'Name'}, {:name => 'Uptime'}, {:name => 'Public Address'},
{:name => 'State'}], @deployment.instances) do |instance|
+= filter_table([{:name =>''}, {:name => ''}, {:name =>
'Name'}, {:name => 'Public Address'}, {:name => 'State'}],
@deployment.instances) do |instance|
%tr
%td
%input{:name => "instance_selected[]", :type =>
"checkbox", :value => instance.id, :id =>
"instance_checkbox_#{instance.id}" }
@@ -9,8 +9,6 @@
%td
= instance.name
%td
- = count_uptime(instance.created_at)
- %td
= instance.public_addresses
%td
= instance.state
diff --git a/src/app/views/deployments/_operation.haml
b/src/app/views/deployments/_operation.haml
index 4462cd2..34da8dc 100644
--- a/src/app/views/deployments/_operation.haml
+++ b/src/app/views/deployments/_operation.haml
@@ -1,7 +1,5 @@
%h3 Operational status of #{(a)deployment.name}
-Uptime:
-= count_uptime((a)deployment.created_at)
%br
Count of instances:
= @deployment.instances.count
diff --git a/src/app/views/deployments/_pretty_view_show.haml
b/src/app/views/deployments/_pretty_view_show.haml
index 9b4840e..aacb80f 100644
--- a/src/app/views/deployments/_pretty_view_show.haml
+++ b/src/app/views/deployments/_pretty_view_show.haml
@@ -6,9 +6,6 @@
= instance.name
%ul
%li
- Uptime:
- = count_uptime(instance.created_at)
- %li
IP Address:
= instance.public_addresses
%li
diff --git a/src/app/views/instances/_properties.haml
b/src/app/views/instances/_properties.haml
index 38b3ecc..e59d881 100644
--- a/src/app/views/instances/_properties.haml
+++ b/src/app/views/instances/_properties.haml
@@ -33,9 +33,6 @@
= label_tag :instantiation_time, 'Instantiation Time'
%span= @instance.created_at.strftime("%d-%b-%Y %H:%M:%S")
%li
- = label_tag :uptime, 'Uptime'
- %span= @instance.total_state_time((a)instance.state)
- %li
= label_tag :current_alerts, 'Current Alerts'
%span= 0
%li
diff --git a/src/app/views/pools/_deployments.haml
b/src/app/views/pools/_deployments.haml
index ea2ddb3..cdd99ad 100644
--- a/src/app/views/pools/_deployments.haml
+++ b/src/app/views/pools/_deployments.haml
@@ -6,9 +6,6 @@
= link_to deployment.name, deployment_path(deployment)
%dl.statistics
%ul
- %li.left
- %dt.uptime Uptime
- %dd= count_uptime(deployment.created_at || Time.now)
%li.right
%dt.instances.count Instances
%dd= deployment.instances.count || 0
\ No newline at end of file
Aside from some erroneous text in your commit message, ACK.
-- Matt