diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml index 59f077c47a64a1ff8ac505c693741f17580b75ee..5270fbe2d9cbf72dc735ad7aa87d18bcea696f04 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTML.xml @@ -62,8 +62,8 @@ display_style_list here/getDisplayStyleList;\n list_style here/getListboxDisplayStyle;\n global_search_column here/getGlobalSearchColumn;\n - global_search_column_script here/getGlobalSearchColumnScript;\n - show_global_search python: global_search_column not in (\'\', None) and global_search_column_script not in (\'\', None);\n + global_search_column_script python: here.getGlobalSearchColumnScript() or \'Base_doSelect\';\n + show_global_search python: global_search_column not in (\'\', None);\n line_list here/query;\n listbox_max_lines python: int(here.getMaxLineNumber());\n total_line python: int(here.total_size);\n @@ -380,7 +380,9 @@ <tal:block tal:condition="python: search_field is None">\n <input tal:condition="python: not is_gadget_mode" \n name="id" size="5" value=""\n - type="text" tal:attributes="name alias; value param"/>\n + type="text" \n + tal:attributes="name alias; value param"\n + onkeypress="submitFormOnEnter(event, this.form, \'Base_doSelect\');"/>\n <!-- Search for gadget mode -->\n <input tal:condition="python: is_gadget_mode" \n tal:define ="params python: {alias:\'this.value\'};"\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml index 0c5f94406275c7f0e1f93ff39e9b911b74bd0e83..304ff7e9738e45e19286851cb9be2efce139bbca 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asHTMLLibrary.xml @@ -100,23 +100,31 @@ \n <div class=" listbox-full-text-search"\n metal:define-macro="listbox_global_search"\n - tal:define="search_text real_context/Base_getSearchText">\n + tal:define="search_text python: request.get(global_search_column, \n + selection.params.get(global_search_column));">\n \n <tal:block tal:condition="not: is_gadget_mode">\n <!-- Normal mode -->\n <input type="text"\n + title="Global Search"\n + i18n:domain="ui" i18n:attributes="value; title" \n tal:attributes="value search_text;\n name global_search_column;\n onkeypress string: submitFormOnEnter(event, this.form, \'${global_search_column_script}\');"/>\n <input class="button" \n - i18n:domain="ui" i18n:attributes="value"\n - value="Search" type="submit" \n + value="Search" \n + type="submit"\n + title="Search"\n + i18n:domain="ui" i18n:attributes="value; title" \n tal:attributes="name string:${global_search_column_script}:method"/>\n </tal:block>\n +\n <tal:block tal:condition="is_gadget_mode">\n <!-- Gadget mode -->\n <input tal:define="params python: {\'%s:method\' %global_search_column_script:\'\',\'%s\' %global_search_column:\'this.value\'};"\n type="text"\n + title="Global Search"\n + i18n:domain="ui" i18n:attributes="value; title"\n tal:attributes=\'value search_text;\n name global_search_column;\n onkeypress python:"if(event.keyCode==13){" + real_context.KnowledgePad_generateAjaxCall(context_url+"/"+form_id,box,box_id,params).replace("\\"this.value\\"","this.value")+ "return false;;}"\'/>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 758690690eec2a95cb22fa3c4f26f5627d643415..a0ce719908cad1a240839b99bb8ab9a86cae61ee 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -1015 \ No newline at end of file +1016 \ No newline at end of file