Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #38667 by Neil: removed a column from the table on the watchdog page.

4.7.x
Dries Buytaert 2005-11-24 19:50:50 +00:00
parent c9b342e3e1
commit 70eb349d88
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/watchdog.module
View File

@ -102,7 +102,7 @@ function watchdog_overview() {
array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
array('data' => t('Message'), 'field' => 'w.message'),
array('data' => t('User'), 'field' => 'u.name'),
array('data' => t('Operations'), 'colspan' => '2')
array('data' => t('Operations'))
);
$sql = 'SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid '. $queries[$_SESSION['watchdog_overview_filter']] . tablesort_sql($header);
$result = pager_query($sql, 50);
@ -114,10 +114,9 @@ function watchdog_overview() {
$icons[$watchdog->severity],
t($watchdog->type),
format_date($watchdog->timestamp, 'small'),
truncate_utf8($watchdog->message, 64),
l(truncate_utf8($watchdog->message, 64), 'admin/logs/event/'. $watchdog->wid, array(), NULL, NULL, FALSE, TRUE),
theme('username', $watchdog),
$watchdog->link,
l(t('details'), "admin/logs/event/$watchdog->wid")
),
// Attributes for tr
'class' => "watchdog-". preg_replace('/[^a-z]/i', '-', $watchdog->type) .' '. $classes[$watchdog->severity]
@ -125,7 +124,7 @@ function watchdog_overview() {
}
if (!$rows) {
$rows[] = array(array('data' => t('No log messages available.'), 'colspan' => '7'));
$rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 6));
}

7
modules/watchdog/watchdog.module
View File

@ -102,7 +102,7 @@ function watchdog_overview() {
array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
array('data' => t('Message'), 'field' => 'w.message'),
array('data' => t('User'), 'field' => 'u.name'),
array('data' => t('Operations'), 'colspan' => '2')
array('data' => t('Operations'))
);
$sql = 'SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid '. $queries[$_SESSION['watchdog_overview_filter']] . tablesort_sql($header);
$result = pager_query($sql, 50);
@ -114,10 +114,9 @@ function watchdog_overview() {
$icons[$watchdog->severity],
t($watchdog->type),
format_date($watchdog->timestamp, 'small'),
truncate_utf8($watchdog->message, 64),
l(truncate_utf8($watchdog->message, 64), 'admin/logs/event/'. $watchdog->wid, array(), NULL, NULL, FALSE, TRUE),
theme('username', $watchdog),
$watchdog->link,
l(t('details'), "admin/logs/event/$watchdog->wid")
),
// Attributes for tr
'class' => "watchdog-". preg_replace('/[^a-z]/i', '-', $watchdog->type) .' '. $classes[$watchdog->severity]
@ -125,7 +124,7 @@ function watchdog_overview() {
}
if (!$rows) {
$rows[] = array(array('data' => t('No log messages available.'), 'colspan' => '7'));
$rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 6));
}