fixup! 03efb25 Better validation highlighting

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

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/app/views/admin_public_body_categories/_form.html.erb b/app/views/admin_public_body_categories/_form.html.erb
@@ -1,4 +1,3 @@
-
 <% if @category.errors.any? %>
   <ul>
   <% @category.errors.each do |attr, message| %>
@@ -35,8 +34,14 @@
 
   <div class="tab-content">
     <% @category.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_category', @category) 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_categories/_locale_fields.html.erb b/app/views/admin_public_body_categories/_locale_fields.html.erb
@@ -3,23 +3,23 @@
         <%= t.hidden_field :locale, :value => locale.to_s %>
         <label for="<%= form_tag_id(t.object_name, :title, locale) %>" class="control-label">Title</label>
         <div class="controls">
-            <% if locale == I18n.default_locale && t.object.errors[:title].any? %>
+            <% if t.object.errors[:title].any? %>
             <span class="fieldWithErrors">
             <% end %>
             <%= t.text_field :title, :id => form_tag_id(t.object_name, :title, locale), :class => "span4" %>
-            <% if locale == I18n.default_locale && t.object.errors[:title].any? %>
+            <% if t.object.errors[:title].any? %>
             </span>
             <%end %>
         </div>
     </div>
     <div class="control-group">
         <label for="<%= form_tag_id(t.object_name, :description, locale) %>" class="control-label">Description</label>
         <div class="controls">
-            <% if locale == I18n.default_locale && t.object.errors[:description].any? %>
+            <% if t.object.errors[:description].any? %>
             <span class="fieldWithErrors">
             <% end %>
             <%= t.text_field :description, :id => form_tag_id(t.object_name, :description, locale), :class => "span4" %>
-            <% if locale == I18n.default_locale && t.object.errors[:description].any? %>
+            <% if t.object.errors[:description].any? %>
             </span>
             <%end %>
         </div>

diff --git a/spec/integration/admin_public_body_category_edit_spec.rb b/spec/integration/admin_public_body_category_edit_spec.rb
@@ -12,7 +12,7 @@
 
     it 'can edit the default locale' do
         @admin.visit edit_admin_category_path(@category)
-        @admin.fill_in 'public_body_category_translations_attributes_en_title__en', :with => 'New Category EN'
+        @admin.fill_in 'public_body_category_title__en', :with => 'New Category EN'
         @admin.click_button 'Save'
 
         @category.reload