lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix context of filter not lost

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-07 12:08:25 +01:00
parent b95cd2f383
commit 852c4fc033
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/user/card.php
View File

@ -1231,7 +1231,7 @@ else
if ($mode == 'employee') // For HRM module development
{
$title = $langs->trans("Employee");
$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php">'.$langs->trans("BackToList").'</a>';
$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
}
else
{
@ -1239,7 +1239,7 @@ else
$linkback = '';
if ($user->rights->user->user->lire || $user->admin) {
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
}
}

4
htdocs/user/group/card.php
View File

@ -330,7 +330,9 @@ else
{
dol_fiche_head($head, 'group', $title, -1, 'group');
dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/index.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';

2
htdocs/user/group/index.php
View File

@ -181,7 +181,7 @@ if ($resql)
{
$obj = $db->fetch_object($resql);
$grouptemp->id = $obj->id;
$grouptemp->id = $obj->rowid;
$grouptemp->name = $obj->name;
$grouptemp->note = $obj->note;

4
htdocs/user/group/ldap.php
View File

@ -105,7 +105,9 @@ $head = group_prepare_head($object);
dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/index.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
dol_banner_tab($object,'id',$linback,$user->rights->user->user->lire || $user->admin);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';

3
htdocs/user/group/perms.php
View File

@ -191,8 +191,9 @@ if ($object->id > 0)
dol_print_error($db);
}
$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/index.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';

4
htdocs/user/index.php
View File

@ -435,7 +435,7 @@ while ($i < min($num,$limit))
$userstatic->employee=$obj->employee;
$userstatic->photo=$obj->photo;
$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
$li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login','',1);
print "<tr>";
if (! empty($arrayfields['u.login']['checked']))
@ -541,7 +541,7 @@ while ($i < min($num,$limit))
$user2->admin=$obj->admin2;
$user2->email=$obj->email2;
$user2->socid=$obj->fk_soc2;
print $user2->getNomUrl(-1,'',0,0,24,0,'');
print $user2->getNomUrl(-1,'',0,0,24,0,'','',1);
if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
{
print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');