Skip to content

Commit bde0503

Browse files
committed
show level editing errors at both top and bottom of form
1 parent 11b5002 commit bde0503

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

dashboard/app/views/levels/_form.html.haml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
#validation-error{style: 'background-color: yellow'}
2-
- if @level.errors.any?
3-
%h2
4-
= pluralize(@level.errors.count, "error")
5-
prohibited this level from being saved:
6-
%ul
7-
- @level.errors.full_messages.each do |msg|
8-
%li= msg
1+
#validation-error.validation-error{style: 'background-color: yellow'}
92
= form_for [@level], method: @level.new_record? ? :post : :patch, remote: true do |f|
103
= f.hidden_field :type, value: @type_class.to_s.presence || @level.type
114
.field
@@ -31,6 +24,7 @@
3124
= render partial: 'levels/editors/dsl', locals: {f: f} if @level.is_a? DSLDefined
3225
.actions
3326
= f.submit
27+
#validation-error.validation-error{style: 'background-color: yellow'}
3428
:javascript
3529
#{render partial: 'shared/ajax_submit', formats: [:js], locals: {form_selector: @level.new_record? ? '#new_level' : '.edit_level'}}
3630
function make_selection_handler(flag) {

dashboard/app/views/shared/_ajax_submit.js.erb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
$(document).ready(function () {
22
var form_selector = '<%=form_selector%>';
3-
console.log('form selector=' + form_selector);
43
$(form_selector).on('ajax:beforeSend', function (e, xhr) {
5-
$('#validation-error').empty();
4+
$('.validation-error').empty();
65
var token = $('meta[name="csrf-token"]').attr('content');
76
xhr.setRequestHeader('X-CSRF-TOKEN', token);
87
});
@@ -18,7 +17,7 @@ $(document).ready(function () {
1817
} catch (err) {
1918
errors = {message: "Error (" + error + "): " + xhr.responseText};
2019
}
21-
$('#validation-error')
20+
$('.validation-error')
2221
.html("<p>Couldn't create level:</p>")
2322
.append($("<ul/>")
2423
.append(Object.keys(errors).map(function (v) {

0 commit comments

Comments
 (0)