Skip to content

Issue #159. Deal with drupal-only actions #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 1.x-2.x
Choose a base branch
from
Open

Issue #159. Deal with drupal-only actions #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fce5d18
Issue #159. Deal with drupal-only actions
argiepiano May 28, 2022
3dd33fc
Added a way to hide the action if marked hidden
argiepiano May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions modules/system.eval.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ function rules_action_backdrop_message($message, $status, $repeat) {
backdrop_set_message(filter_xss_admin($message), $status, $repeat);
}

/**
* Action: Show a backdrop message (drupal namespace).
*
* @deprecated
*/
function rules_action_drupal_message($message, $status, $repeat) {
watchdog('rules', 'The action drupal_message is deprecated. This action is now named <em>backdrop_message</em>.', array(), WATCHDOG_DEPRECATED);
rules_log('The action drupal_message is deprecated. This action is now named <em>backdrop_message</em>.', array(), RulesLog::WARN);
rules_action_backdrop_message($message, $status, $repeat);
}

/**
* Action: Write a watchdog db log message.
*/
Expand All @@ -29,6 +40,17 @@ function rules_action_backdrop_watchdog($type, $message, $severity, $link_text,
watchdog($type, $message, array(), $severity, $link);
}

/**
* Action: Write a watchdog db log message (drupal namespace).
*
* @deprecated
*/
function rules_action_drupal_watchdog($type, $message, $severity, $link_text, $link_path) {
watchdog('rules', 'The action drupal_watchdog is deprecated. This action is now named <em>backdrop_watchdog</em>.', array(), WATCHDOG_DEPRECATED);
rules_log('The action drupal_watchdog is deprecated. This action is now named <em>backdrop_watchdog</em>.', array(), RulesLog::WARN);
rules_action_backdrop_watchdog($type, $message, $severity, $link_text, $link_path);
}

/**
* Action: Page redirect.
*
Expand Down
14 changes: 13 additions & 1 deletion modules/system.rules.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function _rules_system_watchdog_log_entry_info() {
* Implements hook_rules_action_info() on behalf of the system module.
*/
function rules_system_action_info() {
return array(
$return = array(
'backdrop_message' => array(
'label' => t('Show a message on the site'),
'group' => t('System'),
Expand Down Expand Up @@ -304,6 +304,18 @@ function rules_system_action_info() {
'access callback' => 'rules_system_integration_access',
),
);

$return['drupal_message'] = $return['backdrop_message'];
$return['drupal_message']['label'] = t('Show a message on the site. DEPRECATED.');
$return['drupal_message']['base'] = 'rules_action_drupal_message';
$return['drupal_message']['hidden'] = TRUE; // @todo To be implemented

$return['drupal_watchdog'] = $return['backdrop_watchdog'];
$return['drupal_watchdog']['label'] = t('Logs a message to the system dblog. DEPRECATED.');
$return['drupal_watchdog']['base'] = 'rules_action_drupal_watchdog';
$return['drupal_watchdog']['hidden'] = TRUE; // @todo To be implemented

return $return;
}

/**
Expand Down
8 changes: 6 additions & 2 deletions ui/ui.core.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,10 +1318,14 @@ class RulesUICategory {
continue;
}
if ($group = RulesUICategory::getItemGroup($info)) {
$sorted_data[backdrop_ucfirst($group)][$name] = backdrop_ucfirst($info['label']);
if (empty($info['hidden'])) {
$sorted_data[backdrop_ucfirst($group)][$name] = backdrop_ucfirst($info['label']);
}
}
else {
$ungrouped[$name] = backdrop_ucfirst($info['label']);
if (empty($info['hidden'])) {
$ungrouped[$name] = backdrop_ucfirst($info['label']);
}
}
}
asort($ungrouped);
Expand Down