@@ -2,18 +2,16 @@ # Read only fields. if @resource[:class].typus_field_options_for(:read_only).to_s.include?(attribute) - custom = { :readonly => 'readonly' } + options[:readonly] = 'readonly' label_text << " <small>#{_("Read only")}</small>" end # Auto generated fields. if @resource[:class].typus_field_options_for(:auto_generated).include?(attribute) - custom = { :auto_generated => true } + options[:auto_generated] = true label_text << " <small>#{_("Auto generated")}</small>" end - options = options.merge!(custom) - %> <li> app/views/admin/templates/_string.html.erb c5081afd1492acfade6ac95ec139c834eef35c5c Francesc Esplugas francesc@intraducibles.com http://github.com/fesplugas/typus/commit/36ad45be30160e9f3fe3e608aec7b90849a94ea3 36ad45be30160e9f3fe3e608aec7b90849a94ea3 2009-11-05T09:27:13-08:00 2009-11-05T09:27:13-08:00 Revert "Merge the options." This reverts commit 29eba12bc3495616331e8d851961445872e3fcdc. b1f01bbae0eeb04000347aa0d66c7b8b89e784fd Francesc Esplugas francesc@intraducibles.com