From c2e3c8d60af7f056daf053d5496511eb91542e29 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Fri, 15 Nov 2013 18:59:50 +0100 Subject: [PATCH] LSformElement_select_object : Added filter parameter --- .../includes/class/class.LSformElement_select_object.php | 3 ++- public_html/includes/js/LSformElement_select_object_field.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public_html/includes/class/class.LSformElement_select_object.php b/public_html/includes/class/class.LSformElement_select_object.php index 8fd3eba8..8e10f811 100644 --- a/public_html/includes/class/class.LSformElement_select_object.php +++ b/public_html/includes/class/class.LSformElement_select_object.php @@ -68,6 +68,7 @@ class LSformElement_select_object extends LSformElement { 'addBtn' => _('Modify'), 'deleteBtns' => _('Delete'), 'multiple' => (($this -> params['multiple'])?1:0), + 'filter64' => (($this -> params['html_options']['selectable_object']['filter'])?base64_encode($this -> params['html_options']['selectable_object']['filter']):''), 'noValueLabel' => _('No set value'), 'noResultLabel' => _('No result') ) @@ -150,7 +151,7 @@ class LSformElement_select_object extends LSformElement { if (is_array($this -> params['html_options']['selectable_object'])) { if (LSsession :: loadLSobject($this -> params['html_options']['selectable_object']['object_type'])) { $obj = new $this -> params['html_options']['selectable_object']['object_type'](); - $ret = $obj -> getSelectArray($pattern,NULL,$this -> params['html_options']['selectable_object']['display_name_format']); + $ret = $obj -> getSelectArray($pattern,NULL,$this -> params['html_options']['selectable_object']['display_name_format'],false,true,$this -> params['html_options']['selectable_object']['filter']); if (is_array($ret)) { return $ret; } diff --git a/public_html/includes/js/LSformElement_select_object_field.js b/public_html/includes/js/LSformElement_select_object_field.js index 8b3508fd..911e98f9 100644 --- a/public_html/includes/js/LSformElement_select_object_field.js +++ b/public_html/includes/js/LSformElement_select_object_field.js @@ -108,7 +108,7 @@ var LSformElement_select_object_field = new Class({ varLSsmoothbox.asNew(); varLSsmoothbox.addEvent('valid',this.onLSsmoothboxValid.bind(this)); varLSsmoothbox.displayValidBtn(); - varLSsmoothbox.openURL('select.php?LSobject='+this.params['object_type']+((this.params['multiple'])?'&multiple=1':''),{width: 635}); + varLSsmoothbox.openURL('select.php?LSobject='+this.params['object_type']+((this.params['multiple'])?'&multiple=1':'')+((this.params['filter64'])?'&filter64='+this.params['filter64']:''),{width: 635}); } },