forked from extern/egroupware
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
This commit is contained in:
parent
2914721a58
commit
3a14a39902
@ -335,7 +335,6 @@
|
||||
}
|
||||
$all_groups = $this->search(array(
|
||||
'type' => 'groups',
|
||||
'app' => $app,
|
||||
));
|
||||
foreach($all_groups as $group)
|
||||
{
|
||||
@ -371,11 +370,6 @@
|
||||
$link_data['group_id'] = $group_id; // reset it
|
||||
|
||||
// --------------------------------- nextmatch ---------------------------
|
||||
|
||||
// no overload for the first loading
|
||||
if($query_type)
|
||||
{
|
||||
|
||||
$users = $this->search(array(
|
||||
'type' => $group_id ? $group_id : $use,
|
||||
'app' => $app,
|
||||
@ -385,7 +379,6 @@
|
||||
'query' => $query,
|
||||
'query_type' => $query_type,
|
||||
));
|
||||
} // querytype
|
||||
|
||||
$GLOBALS['phpgw']->template->set_var(array(
|
||||
'left' => $this->nextmatchs->left('/index.php',$start,$this->total,$link_data+array('query'=>$query)),
|
||||
@ -403,8 +396,6 @@
|
||||
$GLOBALS['phpgw']->template->set_var('lang_firstname', lang("firstname"));
|
||||
$GLOBALS['phpgw']->template->set_var('lang_lastname', lang("lastname"));
|
||||
|
||||
if( is_array($users) )
|
||||
{
|
||||
foreach($users as $user)
|
||||
{
|
||||
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color($tr_color,True));
|
||||
@ -421,7 +412,6 @@
|
||||
));
|
||||
$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('query_type',is_array($this->query_types) ? $this->html->select('query_type',$query_type,$this->query_types) : '');
|
||||
|
Loading…
Reference in New Issue
Block a user