dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 627

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-01-29 16:19:11 -06:00
parent 891f04106b
commit 209f88b7b5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-01-29 15:53:22) stable Version 1.99.4 (2012-01-29 16:18:48) stable
gluon/sqlhtml.py
+3 -4
View File
@@ -1352,12 +1352,12 @@ class SQLFORM(FORM):
_class='w2p_query_row hidden')) _class='w2p_query_row hidden'))
criteria.insert(0,SELECT( criteria.insert(0,SELECT(
_id="w2p_query_fields", _id="w2p_query_fields",
_onchange="jQuery('.w2p_query_row').hide();jQuery('#w2p_field_'+jQuery(this).val().replace('.','-')).show();", _onchange="jQuery('.w2p_query_row').hide();jQuery('#w2p_field_'+jQuery('#w2p_query_fields').val().replace('.','-')).show();",
*[OPTION(label, _value=fname) for fname,label in selectfields])) *[OPTION(label, _value=fname) for fname,label in selectfields]))
fadd = SCRIPT(""" fadd = SCRIPT("""
jQuery('#w2p_query_panel input,#w2p_query_panel select').css( jQuery('#w2p_query_panel input,#w2p_query_panel select').css(
'width','auto').css('float','left'); 'width','auto').css('float','left');
jQuery(function(){web2py_ajax_fields();}); jQuery(function(){web2py_ajax_fields('#w2p_query_panel');});
function w2p_build_query(aggregator,a){ function w2p_build_query(aggregator,a){
var b=a.replace('.','-'); var b=a.replace('.','-');
var option = jQuery('#w2p_field_'+b+' select').val(); var option = jQuery('#w2p_field_'+b+' select').val();
@@ -1366,14 +1366,13 @@ class SQLFORM(FORM):
var k=jQuery('#web2py_keywords'); var k=jQuery('#web2py_keywords');
var v=k.val(); var v=k.val();
if(aggregator=='new') k.val(s); else k.val((v?(v+' '+ aggregator +' '):'')+s); if(aggregator=='new') k.val(s); else k.val((v?(v+' '+ aggregator +' '):'')+s);
jQuery('#w2p_query_fields').val('').change();
jQuery('#w2p_query_panel').slideUp(); jQuery('#w2p_query_panel').slideUp();
} }
""") """)
return CAT( return CAT(
INPUT( INPUT(
_value=T("Query"),_type="button",_id="w2p_query_trigger", _value=T("Query"),_type="button",_id="w2p_query_trigger",
_onclick="jQuery('#w2p_query_fields').val('');jQuery('#w2p_query_panel').slideToggle();"), _onclick="jQuery('#w2p_query_fields').change();jQuery('#w2p_query_panel').slideToggle();"),
DIV(_id="w2p_query_panel", DIV(_id="w2p_query_panel",
_style='position:absolute;z-index:1000', _style='position:absolute;z-index:1000',
_class='hidden', _class='hidden',