BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d52a3281 by Dmitriy Zaporozhets
Options

Merge branch 'small-ui-improvements' into 'master'

Small ui improvements * fix ugly errors block when admin save invalid user * fix ugly errors when you tries to save invalid wiki page
parents 2e8f4bf3 1a4c9118
Showing with 4 additions and 5 deletions
app/views/admin/users/_form.html.haml
......@@ -2,9 +2,9 @@
= form_for [:admin, @user], html: { class: 'form-horizontal' } do |f|
-if @user.errors.any?
#error_explanation
%ul.unstyled.alert.alert-danger
.alert.alert-danger
- @user.errors.full_messages.each do |msg|
%li= msg
%p= msg
%fieldset
%legend Account
......
app/views/projects/wikis/_form.html.haml
= form_for [@project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f|
-if @page.errors.any?
#error_explanation
%h2= "#{pluralize(@page.errors.count, "error")} prohibited this wiki from being saved:"
%ul
.alert.alert-danger
- @page.errors.full_messages.each do |msg|
%li= msg
%p= msg
= f.hidden_field :title, value: @page.title
.form-group
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment