extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

"bugfix: removed accidently (not working) added search for groups"

Browse Source
This commit is contained in:
Ralf Becker 2007-05-27 06:26:17 +00:00
parent ff82a825f7
commit 23b75e9e91
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.uiaccountsel.inc.php
View File

@ -97,7 +97,7 @@ class uiaccountsel extends accounts
*/ */
function selection($name,$element_id,$selected,$use='accounts',$lines=0,$not=False,$options='',$onchange='',$select=False,$nohtml=false) function selection($name,$element_id,$selected,$use='accounts',$lines=0,$not=False,$options='',$onchange='',$select=False,$nohtml=false)
{ {
//echo "<p align=right>uiaccountsel::selection('$name',".print_r($selected,True).",'$use',rows=$lines,$not,'$options','$onchange',".print_r($select,True).") account_selection=$this->account_selection</p>\n"; //echo "<p align=right>uiaccountsel::selection('$name','$element_id',".print_r($selected,True).",'$use',rows=$lines,$not,'$options','$onchange',".print_r($select,True).") account_selection=$this->account_selection</p>\n";
$multi_size=4; $multi_size=4;
if ($lines < 0) if ($lines < 0)
{ {
@ -138,6 +138,7 @@ class uiaccountsel extends accounts
// fall-through // fall-through
case 'owngroups': case 'owngroups':
$only_groups = true;
$account_sel = 'selectbox'; // groups always use only the selectbox $account_sel = 'selectbox'; // groups always use only the selectbox
break; break;
} }
@ -243,7 +244,7 @@ class uiaccountsel extends accounts
)); ));
$popup_options = 'width=600,height=400,toolbar=no,scrollbars=yes,resizable=yes'; $popup_options = 'width=600,height=400,toolbar=no,scrollbars=yes,resizable=yes';
$app = $GLOBALS['egw_info']['flags']['currentapp']; $app = $GLOBALS['egw_info']['flags']['currentapp'];
if ($lines <= 1 && $this->account_selection == 'popup' || !$lines && $this->account_selection == 'primary_group') if (!$only_groups && ($lines <= 1 && $this->account_selection == 'popup' || !$lines && $this->account_selection == 'primary_group'))
{ {
if (!$lines) if (!$lines)
{ {
@ -279,14 +280,14 @@ class uiaccountsel extends accounts
//echo "<p>html::select('$name',".print_r($selected,True).",".print_r($select,True).",True,'$options')</p>\n"; //echo "<p>html::select('$name',".print_r($selected,True).",".print_r($select,True).",True,'$options')</p>\n";
$html = $this->html->select($name,$selected,$select,True,$options.' id="'.$element_id.'"',$lines > 1 ? $lines : 0); $html = $this->html->select($name,$selected,$select,True,$options.' id="'.$element_id.'"',$lines > 1 ? $lines : 0);
if ($lines > 0 && $this->account_selection == 'popup' || $lines > 1 && $this->account_selection == 'primary_group') if (!$only_groups && ($lines > 0 && $this->account_selection == 'popup' || $lines > 1 && $this->account_selection == 'primary_group'))
{ {
$js = "window.open('$link','uiaccountsel','$popup_options'); return false;"; $js = "window.open('$link','uiaccountsel','$popup_options'); return false;";
$html .= $this->html->submit_button('search','Search accounts',$js,false, $html .= $this->html->submit_button('search','Search accounts',$js,false,
' title="'.$this->html->htmlspecialchars(lang('Search accounts')).'"','search','phpgwapi'); ' title="'.$this->html->htmlspecialchars(lang('Search accounts')).'"','search','phpgwapi');
$need_js_popup = True; $need_js_popup = True;
} }
elseif ($lines == 1 || $lines > 0 && $this->account_selection == 'primary_group') elseif (!$only_groups && ($lines == 1 || $lines > 0 && $this->account_selection == 'primary_group'))
{ {
$js = "if (selectBox = document.getElementById('$element_id')) if (!selectBox.multiple) {selectBox.size=$multi_size; selectBox.multiple=true; if (selectBox.options[0].value=='') selectBox.options[0] = null;"; $js = "if (selectBox = document.getElementById('$element_id')) if (!selectBox.multiple) {selectBox.size=$multi_size; selectBox.multiple=true; if (selectBox.options[0].value=='') selectBox.options[0] = null;";
if (!in_array($this->account_selection,array('groupmembers','selectbox'))) // no popup! if (!in_array($this->account_selection,array('groupmembers','selectbox'))) // no popup!