fixup! a14ce58 Better validation highlighting

mysociety · Mar 6, 2015 · 83a47a9 · crowbot · Mar 10, 2015 · 83a47a9
1 parent 9e1bd38
commit 83a47a9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/app/views/admin_public_body_headings/_form.html.erb b/app/views/admin_public_body_headings/_form.html.erb
@@ -1,4 +1,24 @@
-<%= error_messages_for 'heading' %>
+<% if @heading.errors.any? %>
+  <ul>
+  <% @heading.errors.each do |attr, message| %>
+    <% unless attr.to_s.starts_with?('translation') %>
+    <li><%= message %></li>
+    <% end %>
+  <% end %>
+  </ul>
+<% end %>
+
+<% @heading.ordered_translations.each do |translation| %>
+  <% if translation.errors.any? %>
+    <%= locale_name(translation.locale.to_s) || translation.locale.to_s %>
+    <ul>
+    <% translation.errors.each do |attr, message| %>
+      <li><%= message %></li>
+    <% end %>
+    </ul>
+  <% end %>
+<% end %>
+
 
 <!--[form:public_body_heading]-->
 
@@ -14,8 +34,14 @@
   </ul>
   <div class="tab-content">
     <% @heading.ordered_translations.each do |translation| %>
-      <%= f.fields_for(:translations, translation, :child_index => translation.locale) do |t| %>
-        <%= render :partial => 'locale_fields', :locals => { :t => t, :locale => translation.locale } %>
+      <% if translation.locale.to_s == I18n.default_locale.to_s %>
+        <%= fields_for('public_body_heading', @heading) do |t| %>
+          <%= render :partial => 'locale_fields', :locals => { :t => t, :locale => translation.locale } %>
+        <% end %>
+      <% else %>
+        <%= f.fields_for(:translations, translation, :child_index => translation.locale) do |t| %>
+          <%= render :partial => 'locale_fields', :locals => { :t => t, :locale => translation.locale } %>
+        <% end %>
       <% end %>
     <% end %>
   </div>

diff --git a/app/views/admin_public_body_headings/_locale_fields.html.erb b/app/views/admin_public_body_headings/_locale_fields.html.erb
@@ -3,7 +3,13 @@
         <%= t.hidden_field :locale, :value => locale.to_s %>
         <label for="<%= form_tag_id(t.object_name, :name, locale) %>" class="control-label">name</label>
         <div class="controls">
+            <% if t.object.errors[:name].any? %>
+            <span class="fieldWithErrors">
+            <% end %>
             <%= t.text_field :name, :id => form_tag_id(t.object_name, :name, locale), :class => "span4" %>
+            <% if t.object.errors[:name].any? %>
+            </span>
+            <%end %>
         </div>
     </div>
 </div>
diff --git a/spec/integration/admin_public_body_heading_edit_spec.rb b/spec/integration/admin_public_body_heading_edit_spec.rb
@@ -12,7 +12,7 @@
 
     it 'can edit the default locale' do
         @admin.visit edit_admin_heading_path(@heading)
-        @admin.fill_in 'public_body_heading_translations_attributes_en_name__en', :with => 'New Heading EN'
+        @admin.fill_in 'public_body_heading_name__en', :with => 'New Heading EN'
         @admin.click_button 'Save'
 
         @heading.reload
@@ -55,4 +55,4 @@
         end
     end
 
-end
+end