From e225ad22782b6d344dc41facc879e617b833152a Mon Sep 17 00:00:00 2001 From: Didier Lafforgue Date: Mon, 7 May 2012 00:31:59 +0200 Subject: [PATCH 1/2] fix issue #385 --- .../locomotive/extensions/content_type/default_values.rb | 2 +- spec/models/locomotive/content_type_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/locomotive/extensions/content_type/default_values.rb b/app/models/locomotive/extensions/content_type/default_values.rb index 9fee52b7..e70f0053 100644 --- a/app/models/locomotive/extensions/content_type/default_values.rb +++ b/app/models/locomotive/extensions/content_type/default_values.rb @@ -27,7 +27,7 @@ module Locomotive def set_label_field if @new_label_field_name.present? - self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }._id + self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }.try(:_id) end # unknown label_field_name, get the first one instead diff --git a/spec/models/locomotive/content_type_spec.rb b/spec/models/locomotive/content_type_spec.rb index 0e7911f9..4cda81d5 100644 --- a/spec/models/locomotive/content_type_spec.rb +++ b/spec/models/locomotive/content_type_spec.rb @@ -284,6 +284,13 @@ describe Locomotive::ContentType do lambda { asset.active_at }.should raise_error end + it 'removes the field used as the label when setting the original label_field_name value before' do + @content_type.label_field_name = 'name' + @content_type.entries_custom_fields.destroy_all :conditions => { :name => @content_type.label_field_name } + @content_type.save + @content_type.label_field_name.should == 'description' + end + it 'renames field label' do @content_type.entries_custom_fields[1].label = 'Simple description' @content_type.entries_custom_fields[1].name = nil From c0627bf8a70450e77b702be1303f13040a4d4f1f Mon Sep 17 00:00:00 2001 From: Will Cosgrove Date: Tue, 8 May 2012 22:31:20 -0500 Subject: [PATCH 2/2] Fixed typo for bootstrap setting: `data-toogle` to `data-toggle` --- lib/locomotive/liquid/tags/nav.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/locomotive/liquid/tags/nav.rb b/lib/locomotive/liquid/tags/nav.rb index 7dd2fbbe..f327e19d 100644 --- a/lib/locomotive/liquid/tags/nav.rb +++ b/lib/locomotive/liquid/tags/nav.rb @@ -95,7 +95,7 @@ module Locomotive if render_children_for_page?(page, depth) && bootstrap? css += ' dropdown' - link_options = %{ class="dropdown-toggle" data-toogle="dropdown"} + link_options = %{ class="dropdown-toggle" data-toggle="dropdown"} href = '#' caret = %{ } end