[PATCH conductor 2/2] BZ 785198 - Display an error message on broken builds
Matt Wagner
matt.wagner at redhat.com
Wed Feb 1 17:43:47 UTC 2012
If we have a target image but @latest_build is not set, we can infer
that the build has failed. We should notify the user of this fact,
instead of pretending everything is fine.
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=785198
---
src/app/views/images/show.html.haml | 3 +++
src/config/locales/en.yml | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
index 7e777c0..aed71bc 100644
--- a/src/app/views/images/show.html.haml
+++ b/src/app/views/images/show.html.haml
@@ -81,6 +81,9 @@
= t('images.show.failed_push_attempts', :count => failed_push_count )
- elsif pimg
= button_to "", image_provider_image_path(@image.id, pimg.id), :method => :delete, :class => 'delete_image'
+ - elsif timg and not @latest_build
+ -# This is an apparent error condition -- the build is bad
+ = t('images.show.dangling_build')
- else
.clear
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index d76e0ef..cc60fc5 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -750,6 +750,7 @@ en:
failed_push_attempts:
one: '1 failed push attempt'
other: '%{count} failed push attempts'
+ dangling_build: This build appears to have failed and left an orphaned image.
flash:
notice:
deleted: Image Deleted
--
1.7.6.5
More information about the aeolus-devel
mailing list