lolita 3.2.0.rc.13 → 3.2.0.rc.14

data/app/views/components/lolita/configuration/field/array/select/_display.html.haml

@@ -1 +1 @@
-= current_form.select field.name, (field.view_values(self)),(field.options || {}).merge({:include_blank => field.include_blank}),field.html_options || {} 
+= current_form.select field.name, (field.view_values(self)),(field.options || {}).merge({:include_blank => field.include_blank, :selected => current_form.object[field.name]}),field.html_options || {} 

data/app/views/components/lolita/configuration/tab/_error_msg.html.haml

@@ -6,9 +6,10 @@
         - if tab.fields.by_name(attr_name.to_sym)
           - klass = resource.lolita.dbi.reflect_on_association(assoc_name.to_sym).klass
           - klass.human_attribute_name(attr_name).downcase
-      - else
-        - if tab.fields.by_name(k.to_sym)
-          - resource.class.human_attribute_name(k)
+      - elsif tab.fields.by_name(k.to_sym)
+        - resource.class.human_attribute_name(k)
+      - elsif assoc = resource.lolita.dbi.reflect_on_association(k.to_sym)
+        - assoc.klass.lolita_model_name.human
       - if title && resource.errors[k] && resource.errors[k].respond_to?(:any?) && resource.errors[k].any?
         - "#{title.to_s.capitalize}: #{resource.errors[k].join(" #{::I18n.t("lolita.shared.and")} ")}"
     = raw(errors.compact.join("<br>"))

data/app/views/components/lolita/navigation/_tree.html.haml

@@ -9,6 +9,6 @@
         - active = branch.active?(self)
         - classes = [] << (active && "active") << (branch.subtree? && "with-subtree") << (!tree.root? && branch == last_branch && "last-in-subtree")
         %li{:class => classes.reject{|e| !e}.join(" ")}
-          = link_to branch.title, branch.options[:url] || "#"
+          = link_to branch.title, branch.options[:calculated_url] || "#"
           - if branch.subtree?
             = render_component(:"lolita/navigation", :tree, :tree => branch.children, :visible => active)

data/lib/lolita/navigation/branch.rb

@@ -66,7 +66,7 @@ module Lolita
       end
 
       def populate_url(view)
-        self.options[:url] = calculate_url(view)
+        self.options[:calculated_url] = calculate_url(view)
       end
 
       def calculate_url(view)

data/lib/lolita/version.rb

@@ -3,7 +3,7 @@ module Lolita
     MAJOR = 3
     MINOR = 2
     PATCH = 0
-    BUILD = 'rc.13'
+    BUILD = 'rc.14'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.13
+  version: 3.2.0.rc.14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -579,7 +579,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2642932304257298610
+      hash: 4171682622327448422
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: