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

New: Use ajax confirm on purge for audit events

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-06 09:05:16 +00:00
parent e0f2e3b37d
commit ecf9630ec3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dict.php
View File

@ -638,9 +638,13 @@ if ($_GET["id"])
$valuetoshow=$langs->trans('All'); $valuetoshow=$langs->trans('All');
} }
else if ($fieldlist[$field]=='pays') { else if ($fieldlist[$field]=='pays') {
if (empty($obj->pays_code)) print '-';
else
{
$key=$langs->trans("Country".strtoupper($obj->pays_code)); $key=$langs->trans("Country".strtoupper($obj->pays_code));
$valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays; $valuetoshow=($key != "Country".strtoupper($obj->pays_code))?$obj->pays_code." - ".$key:$obj->pays;
} }
}
else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') { else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field]=='fdm') {
$valuetoshow=yn($valuetoshow); $valuetoshow=yn($valuetoshow);
} }

7
htdocs/admin/tools/listevents.php
View File

@ -57,7 +57,7 @@ $pagenext = $page + 1;
*/ */
// Purge audit events // Purge audit events
if ($_POST['action'] == 'confirm_purge' && $_POST['confirm'] == 'yes' && $user->admin) if ($_REQUEST['action'] == 'confirm_purge' && $_REQUEST['confirm'] == 'yes' && $user->admin)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."events"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
@ -104,7 +104,8 @@ if ($result)
if ($_GET["action"] == 'purge') if ($_GET["action"] == 'purge')
{ {
$ret=$form->form_confirm($_SERVER["PHP_SELF"], $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'), 'confirm_purge'); $formquestion=array();
$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'),'confirm_purge',$formquestion,'no',1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
@ -203,7 +204,7 @@ if ($result)
print "</table>"; print "</table>";
$db->free(); $db->free();
if ($num && $_GET["action"] != 'purge') if ($num)
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=purge">'.$langs->trans("Purge").'</a>';