holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented new phpgw-pref account_display as default for select-account

Browse Source
This commit is contained in:
Ralf Becker 2003-05-04 09:18:56 +00:00
parent 5027634065
commit 9825930cd4
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etemplate/doc/referenz.html
View File

@ -534,17 +534,21 @@ implement only a subset of XUL. Here are the main differences:</p>
(id will be ''), additional attr see sub-types<p> (id will be ''), additional attr see sub-types<p>
xml: <b>type</b>: can be set to get several predefined select-contents, in that case you dont need to set xml: <b>type</b>: can be set to get several predefined select-contents, in that case you dont need to set
the content as descripted above (if set it too its in front of the predefined rows): <br> the content as descripted above (if set it too its in front of the predefined rows): <br>
<b>select-cat</b>: Select a phpgw category<br> <b>select-cat</b>:<br>
<b>select-account</b>: Select a user and/or group, determined by the options-field:<br> Select a phpgw category<br>
,{accounts(default)|groups|both},{0(only lid)|1(only names/default)|2(both)}<br> <b>select-account</b>:<br>
<b>select-percent, select-priority, select-access, select-country, select-state</b>: as you expect Select a user and/or group, determined by the options-field:<br>
by the name<br> ,{accounts(default)|groups|both},{''(phpgw-default)|0(only lid)|1(only names)|2(both)}<br>
<b>select-year, select-month, select-day</b>: options for year: ,start,end (start and end can be a number of <b>select-percent, select-priority, select-access, select-country, select-state</b>:<br>
as you expect by the name<br>
<b>select-year, select-month, select-day</b>:<br>
options for year: ,start,end (start and end can be a number of
years from now or if > 100 a absolut year)<br> years from now or if > 100 a absolut year)<br>
<b>select-number</b>: Select a number out of a range specified by the options-field:<br> <b>select-number</b>:<br>
Select a number out of a range specified by the options-field:<br>
,{start (default=1)},{end (incl., default=10)},{decrement (default=1)}<br> ,{start (default=1)},{end (incl., default=10)},{decrement (default=1)}<br>
<b>select-app</b>: Select an application, availible options: <b>select-app</b>:<br>
,{''=user enabled(default)|installed|all)} Select an application, availible options: ,{''=user enabled(default)|installed|all)}
</td> </td>
</tr> </tr>
<tr> <tr>

5
etemplate/inc/class.select_widget.inc.php
View File

@ -565,7 +565,6 @@
case 2: case 2:
$info .= '&lt;'.$acc['account_lid'].'&gt; '; $info .= '&lt;'.$acc['account_lid'].'&gt; ';
// fall-through // fall-through
default:
case 1: case 1:
$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] : $info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
$acc['account_firstname'].' '.$acc['account_lastname']; $acc['account_firstname'].' '.$acc['account_lastname'];
@ -573,6 +572,10 @@
case '0': case '0':
$info .= $acc['account_lid']; $info .= $acc['account_lid'];
break; break;
default: // use the phpgw default
$info = $GLOBALS['phpgw']->common->display_fullname($acc['account_lid'],
$acc['account_firstname'],$acc['account_lastname']);
break;
} }
return $info; return $info;
} }