Code
/
islandora
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

toggled message type

pull/709/head
ajstanley 7 years ago
parent
b73a9e08c1
commit
830962a0e0
1 changed files with 7 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      includes/derivatives.inc

12
includes/derivatives.inc
Unescape View File

@ -135,6 +135,7 @@ function islandora_derivative_logging(array $logging_results) {
$result_message = $result_messages['success']; $result_message = $result_messages['success'];
foreach ($logging_results as $result) { foreach ($logging_results as $result) {
foreach ($result['messages'] as $message) { foreach ($result['messages'] as $message) {
$message_status = 'status';
if ($message['type'] === 'dsm') { if ($message['type'] === 'dsm') {
if (isset($message['severity']) && $message['severity'] != 'status') { if (isset($message['severity']) && $message['severity'] != 'status') {
drupal_set_message(filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array())), $message['severity']); drupal_set_message(filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array())), $message['severity']);
@ -156,12 +157,13 @@ function islandora_derivative_logging(array $logging_results) {
// are merged into the standard release for Coder. // are merged into the standard release for Coder.
call_user_func('watchdog', 'islandora_derivatives', $message['message'], isset($message['message_sub']) ? $message['message_sub'] : array(), isset($message['severity']) ? $message['severity'] : WATCHDOG_NOTICE); call_user_func('watchdog', 'islandora_derivatives', $message['message'], isset($message['message_sub']) ? $message['message_sub'] : array(), isset($message['severity']) ? $message['severity'] : WATCHDOG_NOTICE);
$result_message = $result_messages['incomplete']; $result_message = $result_messages['incomplete'];
$message_status = 'warning';
} }
drupal_set_message(l($result_message, 'islandora/event-status'), 'status', FALSE); drupal_set_message(l($result_message, 'islandora/event-status'), $message_status, FALSE);
if (isset($_SESSION['messages']['warning'])) {
// If there is more than one message something has gone wrong. if (isset($_SESSION['messages']['status'])) {
if (isset($_SESSION['messages']['status'][1])) { unset($_SESSION['messages']['status']);
$_SESSION['messages']['status'] = array(l($result_messages['incomplete'], 'islandora/event-status')); }
} }
} }
} }

Write Preview
Loading…
Cancel
Save