From eb033aa60ec572da447871daf5f1f171439ae5e2 Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Sat, 20 Sep 2014 18:02:01 +0200 Subject: Factor issue and MR edit form error list. --- app/views/projects/_issuable_form.html.haml | 7 +++++++ app/views/projects/issues/_form.html.haml | 7 ------- app/views/projects/merge_requests/_form.html.haml | 5 ----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/views/projects/_issuable_form.html.haml b/app/views/projects/_issuable_form.html.haml index 402cdb44182..32080b767c6 100644 --- a/app/views/projects/_issuable_form.html.haml +++ b/app/views/projects/_issuable_form.html.haml @@ -1,3 +1,10 @@ +- if issuable.errors.any? + .row + .col-sm-10.col-sm-offset-2 + .alert.alert-danger + - issuable.errors.full_messages.each do |msg| + %span= msg + %br .form-group = f.label :title, class: 'control-label' do %strong= 'Title *' diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index d063f92e87f..a4a6b0005c7 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -9,13 +9,6 @@ = "Please review the #{link_to "guidelines for contribution", contribution_guide_url} to this repository.".html_safe = form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f| - -if @issue.errors.any? - .row - .col-sm-10.col-sm-offset-2 - .alert.alert-danger - - @issue.errors.full_messages.each do |msg| - %span= msg - %br = render 'projects/issuable_form', f: f, issuable: @issue .form-group = f.label :label_ids, class: 'control-label' do diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index a97547aabec..8ad47724fe7 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -9,11 +9,6 @@ %strong #{link_to "guidelines for contribution", contribution_guide_url} to this repository. - -if @merge_request.errors.any? - .alert.alert-danger - - @merge_request.errors.full_messages.each do |msg| - %div= msg - .merge-request-form-info = render 'projects/issuable_form', f: f, issuable: @merge_request .form-group -- cgit v1.2.1