Merge branch 'lukas/picked_ques' into development

This commit is contained in:
Matt K. Fu committed 2013-06-06 19:59:30 +08:00
commit d5109c837c
104 files changed
+2963 -1723

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ module OrbitFormHelper
options[:label] ||= I18n.t('datetime_picker.separated.label')
content_tag :div, :id => options[:id], :class => "separated_picker #{options[:class]}" do
concat label_tag options[:label] unless options[:no_label]
concat hidden_field(object_name, method)
concat hidden_field(object_name, method, :value => options[:value])
concat separated_picker(object_name, method, options)
end
else