app/views/main/_properties.html.erb in sferik-merb-admin-0.3.4 vs app/views/main/_properties.html.erb in sferik-merb-admin-0.3.6

- old
+ new

@@ -1,13 +1,14 @@ <fieldset class="module aligned"> <% belongs_to_keys = @abstract_model.belongs_to_associations.map{|b| b[:child_key].first} %> <% properties.each do |property| %> - <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(property[:name]) %> - <% next if belongs_to_keys.include?(property[:name]) %> - <div class="<%= @object.errors[property[:name]] ? "form-row errors" : "form-row" %>"> - <% if @object.errors[property[:name]] %> + <% name = property[:name] %> + <% next if [:id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on].include?(name) %> + <% next if belongs_to_keys.include?(name) %> + <div class="<%= @object.errors[name] ? "form-row errors" : "form-row" %>"> + <% if @object.errors[name] %> <ul class="errorlist"> - <% @object.errors[property[:name]].each do |error| %> + <% @object.errors[name].each do |error| %> <li><%= error %></li> <% end %> </ul> <% end %> <%= partial(property[:type].to_s, :property => property) -%>