NEW Add last change date of page "Other setup". Can sort on name/date

Dolibarr · Oct 1, 2019 · 326d176 · 326d176
1 parent fa92173
commit 326d176
Showing 1 changed file with 29 additions and 7 deletions.
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
@@ -44,6 +44,17 @@
 $constvalue=GETPOST('constvalue', 'none');	// We shoul dbe able to send everything here
 $constnote=GETPOST('constnote', 'alpha');
 
+// Load variable for pagination
+$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (empty($sortfield)) $sortfield = 'entity,name';
+if (empty($sortorder)) $sortorder = 'ASC';
 
 
 /*
@@ -176,26 +187,31 @@
 
 print load_fiche_titre($langs->trans("OtherSetup"), '', 'title_setup');
 
-print $langs->trans("ConstDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("ConstDesc")."</span><br>\n";
 print "<br>\n";
 
+$param = '';
+
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" id="action" name="action" value="">';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
+print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n";
 print '<td>'.$langs->trans("Value").'</td>';
 print '<td>'.$langs->trans("Comment").'</td>';
-if (! empty($conf->multicompany->enabled) && !$user->entity) print '<td>'.$langs->trans("Entity").'</td>';
+print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center')."\n";
+if (! empty($conf->multicompany->enabled) && !$user->entity)
+{
+	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center')."\n";
+}
 print '<td class="center">'.$langs->trans("Action").'</td>';
 print "</tr>\n";
 
 
 // Line to add new record
-$var=false;
 print "\n";
 
 print '<tr class="oddeven"><td><input type="text" class="flat" size="24" name="constname" value="'.$constname.'"></td>'."\n";
@@ -204,6 +220,8 @@
 print '</td><td>';
 print '<input type="text" class="flat" size="40" name="constnote" value="'.$constnote.'">';
 print '</td>';
+print '<td>';
+print '</td>';
 // Limit to superadmin
 if (! empty($conf->multicompany->enabled) && !$user->entity)
 {
@@ -229,27 +247,26 @@
 $sql.= ", ".$db->decrypt('value')." as value";
 $sql.= ", type";
 $sql.= ", note";
+$sql.= ", tms";
 $sql.= ", entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."const";
 $sql.= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 if ((empty($user->entity) || $user->admin) && $debug) {} 										// to force for superadmin to debug
 elseif (! GETPOST('visible') || GETPOST('visible') != 'all') $sql.= " AND visible = 1";		// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
 if (GETPOST('name')) $sql.=natural_search("name", GETPOST('name'));
-$sql.= " ORDER BY entity, name ASC";
+$sql.= $db->order($sortfield, $sortorder);
 
 dol_syslog("Const::listConstant", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
 	$i = 0;
-	$var=false;
 
 	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
 
-
 		print "\n";
 
 		print '<tr class="oddeven"><td>'.$obj->name.'</td>'."\n";
@@ -267,6 +284,11 @@
 		print '<input type="text" id="note_'.$i.'" class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note, 1).'">';
 		print '</td>';
 
+		// Date last change
+		print '<td>';
+		print dol_print_date($db->jdate($obj->tms), 'dayhour');
+		print '</td>';
+
 		// Entity limit to superadmin
 		if (! empty($conf->multicompany->enabled) && !$user->entity)
 		{