diff --git a/Gemfile b/Gemfile index 362f5ddf..38eb74da 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'carrierwave', '0.5.6' gem 'dragonfly', '~> 0.9.1' gem 'rack-cache', :require => 'rack/cache' -gem 'custom_fields', '1.0.0.beta.22' +gem 'custom_fields', '1.0.0.beta.24' gem 'cancan' gem 'fog', '0.8.2' gem 'mimetype-fu' diff --git a/Gemfile.lock b/Gemfile.lock index 7cd18e38..25a61d19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,6 +5,13 @@ GIT mocha (0.9.12) metaclass (~> 0.0.1) +PATH + remote: ../gems/custom_fields + specs: + custom_fields (1.0.0.beta.23) + activesupport (~> 3.0.9) + mongoid (= 2.0.2) + GEM remote: http://rubygems.org/ specs: @@ -87,9 +94,6 @@ GEM capybara (>= 1.0.0) cucumber (~> 1.0.0) nokogiri (>= 1.4.6) - custom_fields (1.0.0.beta.22) - activesupport (~> 3.0.9) - mongoid (= 2.0.2) daemons (1.1.4) database_cleaner (0.6.7) delayed_job (2.1.4) @@ -299,7 +303,7 @@ DEPENDENCIES carrierwave (= 0.5.6) cells cucumber-rails (= 1.0.2) - custom_fields (= 1.0.0.beta.22) + custom_fields! database_cleaner delayed_job (= 2.1.4) delayed_job_mongoid (= 1.0.2) diff --git a/app/helpers/admin/content_types_helper.rb b/app/helpers/admin/content_types_helper.rb index 4c548c51..80d3d128 100644 --- a/app/helpers/admin/content_types_helper.rb +++ b/app/helpers/admin/content_types_helper.rb @@ -1,3 +1,5 @@ +require 'ruby-debug' + module Admin::ContentTypesHelper MAX_DISPLAYED_CONTENTS = 4 diff --git a/app/views/admin/custom_fields/types/_has_many.html.haml b/app/views/admin/custom_fields/types/_has_many.html.haml index b98c4064..f10a6218 100644 --- a/app/views/admin/custom_fields/types/_has_many.html.haml +++ b/app/views/admin/custom_fields/types/_has_many.html.haml @@ -1,5 +1,3 @@ -- field.target.constantize.reload_parent! # to make sure all the contents from the parent are loaded - = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'has-many', :required => required do .has-many-selector