merge new feature #15

Merged
chiu merged 6 commits from 123/seminar:master into master 2023-09-27 16:22:22 +00:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit 9e1af5e918 - Show all commits

View File

@ -211,7 +211,7 @@ protected
[I18n.locale]+(site.valid_locales-[I18n.locale]) [I18n.locale]+(site.valid_locales-[I18n.locale])
end end
def lang_panel_tabbable_wrapper(add_more_params,&block) def lang_panel_tabbable_wrapper_for_sm(add_more_params,&block)
add_more_counter = '' add_more_counter = ''
if self.markup=='text_area' #or self.markup=='address' if self.markup=='text_area' #or self.markup=='address'
@ -324,7 +324,7 @@ protected
end end
if can_muti_lang_input_for_sm? if can_muti_lang_input_for_sm?
result << lang_panel_tabbable_wrapper(add_more_params,&block) result << lang_panel_tabbable_wrapper_for_sm(add_more_params,&block)
result << gen_modal_dialog if self.markup == "address" result << gen_modal_dialog if self.markup == "address"
# result << add_more_unt if can_add_more # result << add_more_unt if can_add_more
else #cross lang field else #cross lang field