From 09e360b8a9a076c75f7112868d0a84fcb8df9067 Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Tue, 14 Jan 2014 22:14:14 +0400 Subject: [PATCH] #339: updated build_list#show UI --- app/views/projects/build_lists/show.html.haml | 4 ++++ app/views/projects/build_lists/show.json.jbuilder | 1 + 2 files changed, 5 insertions(+) diff --git a/app/views/projects/build_lists/show.html.haml b/app/views/projects/build_lists/show.html.haml index 5cbc139ab..d81448ccd 100644 --- a/app/views/projects/build_lists/show.html.haml +++ b/app/views/projects/build_lists/show.html.haml @@ -160,6 +160,10 @@ .flash_notify .alert.alert-error= t('layout.build_lists.publish_with_extra_fail') .both + %div{'ng-show' => 'build_list.can_publish && build_list.can_publish_in_future && !build_list.can_publish_into_repository'} + .flash_notify + .alert.alert-error= t('flash.build_list.not_all_build_lists_success') + .both - if can?(:cancel, @build_list) = link_to t("layout.build_lists.cancel"), cancel_build_list_path(@build_list), diff --git a/app/views/projects/build_lists/show.json.jbuilder b/app/views/projects/build_lists/show.json.jbuilder index 4a9b46b16..03a1a6d98 100644 --- a/app/views/projects/build_lists/show.json.jbuilder +++ b/app/views/projects/build_lists/show.json.jbuilder @@ -18,6 +18,7 @@ json.build_list do json.extra_build_lists_published @build_list.extra_build_lists_published? json.can_publish_in_future can_publish_in_future?(@build_list) + json.can_publish_into_repository @build_list.can_publish_into_repository? json.container_path container_url if @build_list.container_published?