diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 083b1bcc18c..1f0bb2891c6 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -711,7 +711,7 @@ class UserGroup extends CommonObject
* Use this->id,this->lastname, this->firstname
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
- * @param string $option On what the link point to ('nolink', )
+ * @param string $option On what the link point to ('nolink', 'permissions')
* @param integer $notooltip 1=Disable tooltip on picto and name
* @param string $morecss Add more css on link
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
@@ -730,12 +730,16 @@ class UserGroup extends CommonObject
$result = ''; $label = '';
$label .= '
';
- $label .= ''.$langs->trans("Group").'
';
+ $label .= img_picto('', 'group').' '.$langs->trans("Group").'
';
$label .= ''.$langs->trans('Name').': '.$this->name;
$label .= '
'.$langs->trans("Description").': '.$this->note;
$label .= '
';
- $url = DOL_URL_ROOT.'/user/group/card.php?id='.$this->id;
+ if ($option == 'permissions') {
+ $url = DOL_URL_ROOT.'/user/group/perms.php?id='.$this->id;
+ } else {
+ $url = DOL_URL_ROOT.'/user/group/card.php?id='.$this->id;
+ }
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 302d697c563..493383076b0 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -122,7 +122,7 @@ if (empty($reshook)) {
llxHeader();
-$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
+$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergroup = g.rowid";
@@ -137,7 +137,7 @@ if (!empty($search_group)) {
if ($sall) {
$sql .= natural_search(array("g.nom", "g.note"), $sall);
}
-$sql .= " GROUP BY g.rowid, g.nom, g.note, g.entity, g.datec";
+$sql .= " GROUP BY g.rowid, g.nom, g.note, g.entity, g.datec, g.tms";
$sql .= $db->order($sortfield, $sortorder);
$resql = $db->query($sql);
@@ -197,6 +197,7 @@ if ($resql) {
print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("NbOfPermissions", $_SERVER["PHP_SELF"], "nbpermissions", $param, "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "g.datec", $param, "", '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("DateLastModification", $_SERVER["PHP_SELF"], "g.tms", $param, "", '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("", $_SERVER["PHP_SELF"]);
print "\n";
@@ -222,8 +223,11 @@ if ($resql) {
print ''.$mc->label.' | ';
}
print ''.$obj->nb.' | ';
- print ''.$obj->nbpermissions.' | ';
+ print '';
+ print ''.$obj->nbpermissions.'';
+ print ' | ';
print ''.dol_print_date($db->jdate($obj->datec), "dayhour").' | ';
+ print ''.dol_print_date($db->jdate($obj->datem), "dayhour").' | ';
print ' | ';
print "\n";
$i++;