From: Imre Farkas <ifarkas(a)redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=772755
https://bugzilla.redhat.com/show_bug.cgi?id=773010
https://bugzilla.redhat.com/show_bug.cgi?id=773198
---
src/app/models/deployment.rb | 1 -
src/app/views/pools/_deployments.html.haml | 4 ----
src/config/locales/en.yml | 2 +-
3 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index 14dfd57..6187d3f 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -411,7 +411,6 @@ class Deployment < ActiveRecord::Base
:failed_instances_count => failed_instances.count,
:instances_count_text => I18n.t('instances.instances', :count =>
instances.count.to_i),
:uptime => ApplicationHelper.count_uptime(uptime_1st_instance),
- :global_uptime => ApplicationHelper.count_uptime(uptime_all),
:pool => {
:name => pool.name,
:id => pool.id,
diff --git a/src/app/views/pools/_deployments.html.haml
b/src/app/views/pools/_deployments.html.haml
index 5079b07..0aa6143 100644
--- a/src/app/views/pools/_deployments.html.haml
+++ b/src/app/views/pools/_deployments.html.haml
@@ -5,8 +5,6 @@
%li.deployment
%h3.name
= link_to deployment.name, deployment_path(deployment)
- = t 'pools.index.global_uptime'
- = count_uptime(deployment.uptime_all)
%dl.statistics
%ul
%li.right
@@ -22,8 +20,6 @@
<li class="deployment">
<h3 class="name">
<a
href="#{deployment_path('replace_id').sub('replace_id',
'${id}')}">${name}</a>
- #{t 'pools.index.global_uptime'}
- ${global_uptime}
</h3>
<dl class="statistics">
<ul>
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index e4d4d1e..2ab2ef4 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1081,7 +1081,7 @@ en:
generic: "Could not validate config server connection (url: %{url}). Check
the connection parameters and try again."
generic_with_message: "Could not validate config server connection (url:
%{url}). %{msg}"
unhandled_response: "Could not validate config server connection (url:
%{url}). HTTP Status Code: %{code}"
- uptime: Uptime
+ uptime: 'Total Usage Time'
deltacloud:
unreachable: "Deltacloud is unreachable. Please verify that it is
running."
connection_refused: "The connection to the remote host was refused."
--
1.7.6.5