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

reverted rev. 1.13 changes (primary group not preselected) and fixed bug which caused groups with no app-permission to to be displayed if the selection requires app-permission

Browse Source
This commit is contained in:
Ralf Becker 2004-07-08 09:58:11 +00:00
parent 2914721a58
commit 3a14a39902
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,6 @@
} }
$all_groups = $this->search(array( $all_groups = $this->search(array(
'type' => 'groups', 'type' => 'groups',
'app' => $app,
)); ));
foreach($all_groups as $group) foreach($all_groups as $group)
{ {
@ -371,11 +370,6 @@
$link_data['group_id'] = $group_id; // reset it $link_data['group_id'] = $group_id; // reset it
// --------------------------------- nextmatch --------------------------- // --------------------------------- nextmatch ---------------------------
// no overload for the first loading
if($query_type)
{
$users = $this->search(array( $users = $this->search(array(
'type' => $group_id ? $group_id : $use, 'type' => $group_id ? $group_id : $use,
'app' => $app, 'app' => $app,
@ -385,7 +379,6 @@
'query' => $query, 'query' => $query,
'query_type' => $query_type, 'query_type' => $query_type,
)); ));
} // querytype
$GLOBALS['phpgw']->template->set_var(array( $GLOBALS['phpgw']->template->set_var(array(
'left' => $this->nextmatchs->left('/index.php',$start,$this->total,$link_data+array('query'=>$query)), 'left' => $this->nextmatchs->left('/index.php',$start,$this->total,$link_data+array('query'=>$query)),
@ -403,13 +396,11 @@
$GLOBALS['phpgw']->template->set_var('lang_firstname', lang("firstname")); $GLOBALS['phpgw']->template->set_var('lang_firstname', lang("firstname"));
$GLOBALS['phpgw']->template->set_var('lang_lastname', lang("lastname")); $GLOBALS['phpgw']->template->set_var('lang_lastname', lang("lastname"));
if( is_array($users) )
{
foreach($users as $user) foreach($users as $user)
{ {
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color,True)); $GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color,True));
// ---------------- template declaration for list records -------------------------- // ---------------- template declaration for list records --------------------------
$GLOBALS['phpgw']->template->set_var(array( $GLOBALS['phpgw']->template->set_var(array(
'lid' => $user['account_lid'], 'lid' => $user['account_lid'],
@ -421,7 +412,6 @@
)); ));
$GLOBALS['phpgw']->template->fp('list','accounts_list',True); $GLOBALS['phpgw']->template->fp('list','accounts_list',True);
} }
}
$GLOBALS['phpgw']->template->set_var('accountsel_icon',$this->html->image('phpgwapi','users-big')); $GLOBALS['phpgw']->template->set_var('accountsel_icon',$this->html->image('phpgwapi','users-big'));
$GLOBALS['phpgw']->template->set_var('query_type',is_array($this->query_types) ? $this->html->select('query_type',$query_type,$this->query_types) : ''); $GLOBALS['phpgw']->template->set_var('query_type',is_array($this->query_types) ? $this->html->select('query_type',$query_type,$this->query_types) : '');