opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

84
web/core/modules/dblog/dblog.module
View file

@ -12,6 +12,8 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\views\ViewEntityInterface;
use Drupal\views\ViewExecutable;
/**
* Implements hook_help().
@ -101,7 +103,7 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo
'#title' => t('Database log messages to keep'),
'#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'),
'#options' => [0 => t('All')] + array_combine($row_limits, $row_limits),
'#description' => t('The maximum number of messages to keep in the database log. Requires a <a href=":cron">cron maintenance task</a>.', [':cron' => \Drupal::url('system.status')])
'#description' => t('The maximum number of messages to keep in the database log. Requires a <a href=":cron">cron maintenance task</a>.', [':cron' => \Drupal::url('system.status')]),
];
$form['#submit'][] = 'dblog_logging_settings_submit';
@ -115,3 +117,83 @@ function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $fo
function dblog_logging_settings_submit($form, FormStateInterface $form_state) {
\Drupal::configFactory()->getEditable('dblog.settings')->set('row_limit', $form_state->getValue('dblog_row_limit'))->save();
}
/**
* Implements hook_ENTITY_TYPE_presave() for views entities.
*
* This hook ensures there are no views based that are using a wrong plugin for
* wid and uid fields on views that use watchdog as base table.
*
* @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
*
* @see https://www.drupal.org/node/2876378
*/
function dblog_view_presave(ViewEntityInterface $view) {
// Only interested in watchdog based views.
if ($view->get('base_table') != 'watchdog') {
return;
}
$displays = $view->get('display');
$update = FALSE;
foreach ($displays as $display_name => $display) {
// Iterate through all the fields of watchdog views based tables.
if (isset($display['display_options']['fields'])) {
foreach ($display['display_options']['fields'] as $field_name => $field) {
// We are only interested in wid and uid fields from the watchdog table
// that still use the numeric id.
if (isset($field['table']) &&
$field['table'] === 'watchdog' &&
$field['plugin_id'] == 'numeric' &&
in_array($field['field'], ['wid', 'uid'], TRUE)) {
$displays[$display_name]['display_options']['fields'][$field_name]['plugin_id'] = 'standard';
// Delete all the attributes related to numeric fields.
unset(
$displays[$display_name]['display_options']['fields'][$field_name]['set_precision'],
$displays[$display_name]['display_options']['fields'][$field_name]['precision'],
$displays[$display_name]['display_options']['fields'][$field_name]['decimal'],
$displays[$display_name]['display_options']['fields'][$field_name]['separator'],
$displays[$display_name]['display_options']['fields'][$field_name]['format_plural'],
$displays[$display_name]['display_options']['fields'][$field_name]['format_plural_string'],
$displays[$display_name]['display_options']['fields'][$field_name]['prefix'],
$displays[$display_name]['display_options']['fields'][$field_name]['suffix']
);
$update = TRUE;
@trigger_error("The numeric plugin for watchdog.$field_name field is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Must use standard plugin instead. See https://www.drupal.org/node/2876378.", E_USER_DEPRECATED);
}
}
}
// Iterate all filters looking for type filters to update.
if (isset($display['display_options']['filters'])) {
foreach ($display['display_options']['filters'] as $filter_name => $filter) {
if (isset($filter['table']) &&
$filter['table'] === 'watchdog' &&
$filter['plugin_id'] == 'in_operator' &&
$filter['field'] == 'type') {
$displays[$display_name]['display_options']['filters'][$filter_name]['plugin_id'] = 'dblog_types';
$update = TRUE;
@trigger_error("The in_operator plugin for watchdog.type filter is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Must use dblog_types plugin instead. See https://www.drupal.org/node/2876378.", E_USER_DEPRECATED);
}
}
}
}
if ($update) {
$view->set('display', $displays);
}
}
/**
* Implements hook_views_pre_render().
*/
function dblog_views_pre_render(ViewExecutable $view) {
if (isset($view) && ($view->storage->get('base_table') == 'watchdog')) {
$view->element['#attached']['library'][] = 'dblog/drupal.dblog';
}
}