Merge branch 'master' of github.com:locomotivecms/engine

This commit is contained in:
did 2012-05-24 06:47:15 -07:00
commit 6342b94ede
1 changed files with 7 additions and 0 deletions

View File

@ -83,6 +83,13 @@ module Locomotive
def class_name_to_content_type(class_name) def class_name_to_content_type(class_name)
self.class.class_name_to_content_type(class_name, self.site) self.class.class_name_to_content_type(class_name, self.site)
end end
def label_field_id=(value)
# update the label_field_name if the label_field_id is changed
new_label_field_name = self.entries_custom_fields.where(:_id =>value).first.try(:name)
self.label_field_name = new_label_field_name
super(value)
end
def label_field_name=(value) def label_field_name=(value)
# mandatory if we allow the API to set the label field name without an id of the field # mandatory if we allow the API to set the label field name without an id of the field