diff --git a/core/modules/action/action.api.php b/core/modules/action/action.api.php deleted file mode 100644 index bdd7c0f..0000000 --- a/core/modules/action/action.api.php +++ /dev/null @@ -1,18 +0,0 @@ -condition('aid', $aid) - ->execute(); -} diff --git a/core/modules/action/config/action.settings.yml b/core/modules/action/config/action.settings.yml deleted file mode 100644 index b68bd41..0000000 --- a/core/modules/action/config/action.settings.yml +++ /dev/null @@ -1 +0,0 @@ -recursion_limit: 35 diff --git a/core/modules/action/config/schema/action.schema.yml b/core/modules/action/config/schema/action.schema.yml deleted file mode 100644 index fb7b289..0000000 --- a/core/modules/action/config/schema/action.schema.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Schema for the configuration files of the Action module. - -action.settings: - type: mapping - label: 'Action settings' - mapping: - recursion_limit: - type: integer - label: 'Recursion limit for actions' diff --git a/core/modules/action/config/schema/views.field.schema.yml b/core/modules/action/config/schema/views.field.schema.yml deleted file mode 100644 index cd19eee..0000000 --- a/core/modules/action/config/schema/views.field.schema.yml +++ /dev/null @@ -1,7 +0,0 @@ -views.field.bulk_form: - type: views_field - label: 'Bulk form' - mapping: - action_title: - type: label - label: 'Action title' diff --git a/core/modules/action/action.info.yml b/core/modules/action_ui/action_ui.info.yml similarity index 100% rename from core/modules/action/action.info.yml rename to core/modules/action_ui/action_ui.info.yml diff --git a/core/modules/action/action.module b/core/modules/action_ui/action_ui.module similarity index 88% rename from core/modules/action/action.module rename to core/modules/action_ui/action_ui.module index c7de85c..ebf62b9 100644 --- a/core/modules/action/action.module +++ b/core/modules/action_ui/action_ui.module @@ -8,7 +8,7 @@ /** * Implements hook_help(). */ -function action_help($path, $arg) { +function action_ui_help($path, $arg) { switch ($path) { case 'admin/help#action': $output = ''; @@ -36,7 +36,7 @@ function action_help($path, $arg) { /** * Implements hook_permission(). */ -function action_permission() { +function action_ui_permission() { return array( 'administer actions' => array( 'title' => t('Administer actions'), @@ -47,7 +47,7 @@ function action_permission() { /** * Implements hook_menu(). */ -function action_menu() { +function action_ui_menu() { $items['admin/config/system/actions'] = array( 'title' => 'Actions', 'description' => 'Manage the actions defined for your site.', @@ -59,12 +59,12 @@ function action_menu() { /** * Implements hook_entity_info(). */ -function action_entity_info(&$entity_info) { +function action_ui_entity_info(&$entity_info) { /** @var $entity_info \Drupal\Core\Entity\EntityTypeInterface[] */ $entity_info['action'] - ->setForm('add', 'Drupal\action\ActionAddFormController') - ->setForm('edit', 'Drupal\action\ActionEditFormController') - ->setForm('delete', 'Drupal\action\Form\ActionDeleteForm') - ->setList('Drupal\action\ActionListController') + ->setForm('add', 'Drupal\action_ui\ActionAddFormController') + ->setForm('edit', 'Drupal\action_ui\ActionEditFormController') + ->setForm('delete', 'Drupal\action_ui\Form\ActionDeleteForm') + ->setList('Drupal\action_ui\ActionListController') ->setLinkTemplate('edit-form', 'action.admin_configure'); } diff --git a/core/modules/action/action.routing.yml b/core/modules/action_ui/action_ui.routing.yml similarity index 100% rename from core/modules/action/action.routing.yml rename to core/modules/action_ui/action_ui.routing.yml diff --git a/core/modules/action/action.views.inc b/core/modules/action_ui/action_ui.views.inc similarity index 94% rename from core/modules/action/action.views.inc rename to core/modules/action_ui/action_ui.views.inc index b38eead..dc127f3 100644 --- a/core/modules/action/action.views.inc +++ b/core/modules/action_ui/action_ui.views.inc @@ -11,7 +11,7 @@ * @todo hook_views_data() is used instead of hook_views_data_alter(), because * the alter hook doesn't load the *.views.inc automatically. */ -function action_views_data() { +function action_ui_views_data() { $data['action']['table']['group'] = t('Action'); $data['action']['table']['join'] = array( '#global' => array(), diff --git a/core/modules/action/action.views_execution.inc b/core/modules/action_ui/action_ui.views_execution.inc similarity index 91% rename from core/modules/action/action.views_execution.inc rename to core/modules/action_ui/action_ui.views_execution.inc index 859cffd..1f03c6b 100644 --- a/core/modules/action/action.views_execution.inc +++ b/core/modules/action_ui/action_ui.views_execution.inc @@ -8,7 +8,7 @@ /** * Implements hook_views_form_substitutions(). */ -function action_views_form_substitutions() { +function action_ui_views_form_substitutions() { // Views check_plain()s the column label, so we need to match that. $select_all_placeholder = check_plain(''); $select_all = array( diff --git a/core/modules/action/lib/Drupal/action/ActionAddFormController.php b/core/modules/action_ui/lib/Drupal/action_ui/ActionAddFormController.php similarity index 92% rename from core/modules/action/lib/Drupal/action/ActionAddFormController.php rename to core/modules/action_ui/lib/Drupal/action_ui/ActionAddFormController.php index a1cf893..1f27bd3 100644 --- a/core/modules/action/lib/Drupal/action/ActionAddFormController.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/ActionAddFormController.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\ActionAddFormController. + * Contains \Drupal\action_ui\ActionAddFormController. */ -namespace Drupal\action; +namespace Drupal\action_ui; use Drupal\Component\Utility\Crypt; use Drupal\Core\Action\ActionManager; @@ -55,7 +55,7 @@ public static function create(ContainerInterface $container) { * The hashed version of the action ID. */ public function buildForm(array $form, array &$form_state, $action_id = NULL) { - // In \Drupal\action\Form\ActionAdminManageForm::buildForm() the action + // In \Drupal\action_ui\Form\ActionAdminManageForm::buildForm() the action // are hashed. Here we have to decrypt it to find the desired action ID. foreach ($this->actionManager->getDefinitions() as $id => $definition) { $key = Crypt::hashBase64($id); diff --git a/core/modules/action/lib/Drupal/action/ActionEditFormController.php b/core/modules/action_ui/lib/Drupal/action_ui/ActionEditFormController.php similarity index 65% rename from core/modules/action/lib/Drupal/action/ActionEditFormController.php rename to core/modules/action_ui/lib/Drupal/action_ui/ActionEditFormController.php index ba758f5..3949499 100644 --- a/core/modules/action/lib/Drupal/action/ActionEditFormController.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/ActionEditFormController.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\action\ActionEditFormController. + * Contains Drupal\action_ui\ActionEditFormController. */ -namespace Drupal\action; +namespace Drupal\action_ui; /** * Provides a form controller for action edit forms. diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action_ui/lib/Drupal/action_ui/ActionFormControllerBase.php similarity index 97% rename from core/modules/action/lib/Drupal/action/ActionFormControllerBase.php rename to core/modules/action_ui/lib/Drupal/action_ui/ActionFormControllerBase.php index 3cf0cde..0acf538 100644 --- a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/ActionFormControllerBase.php @@ -2,10 +2,10 @@ /** * @file - * Contains Drupal\action\ActionEditFormController. + * Contains Drupal\action_ui\ActionEditFormController. */ -namespace Drupal\action; +namespace Drupal\action_ui; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Entity\EntityStorageControllerInterface; diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action_ui/lib/Drupal/action_ui/ActionListController.php similarity index 97% rename from core/modules/action/lib/Drupal/action/ActionListController.php rename to core/modules/action_ui/lib/Drupal/action_ui/ActionListController.php index 03f7b75..1f2db77 100644 --- a/core/modules/action/lib/Drupal/action/ActionListController.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/ActionListController.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\ActionListController. + * Contains \Drupal\action_ui\ActionListController. */ -namespace Drupal\action; +namespace Drupal\action_ui; use Drupal\Core\Action\ActionManager; use Drupal\Core\Entity\EntityControllerInterface; diff --git a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php b/core/modules/action_ui/lib/Drupal/action_ui/Form/ActionAdminManageForm.php similarity index 96% rename from core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php rename to core/modules/action_ui/lib/Drupal/action_ui/Form/ActionAdminManageForm.php index e44a7f8..2d7c8a8 100644 --- a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/Form/ActionAdminManageForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\Form\ActionAdminManageForm. + * Contains \Drupal\action_ui\Form\ActionAdminManageForm. */ -namespace Drupal\action\Form; +namespace Drupal\action_ui\Form; use Drupal\Core\Form\FormBase; use Drupal\Component\Utility\Crypt; diff --git a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php b/core/modules/action_ui/lib/Drupal/action_ui/Form/ActionDeleteForm.php similarity index 92% rename from core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php rename to core/modules/action_ui/lib/Drupal/action_ui/Form/ActionDeleteForm.php index 968b7f0..0bec21c 100644 --- a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/Form/ActionDeleteForm.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\Form\ActionDeleteForm. + * Contains \Drupal\action_ui\Form\ActionDeleteForm. */ -namespace Drupal\action\Form; +namespace Drupal\action_ui\Form; use Drupal\Core\Entity\EntityConfirmFormBase; diff --git a/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php b/core/modules/action_ui/lib/Drupal/action_ui/Tests/ActionUninstallTest.php similarity index 64% rename from core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php rename to core/modules/action_ui/lib/Drupal/action_ui/Tests/ActionUninstallTest.php index d91b820..8dc9ea0 100644 --- a/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/Tests/ActionUninstallTest.php @@ -2,17 +2,15 @@ /** * @file - * Contains \Drupal\action\Tests\ActionUninstallTest. + * Contains \Drupal\action_ui\Tests\ActionUninstallTest. */ -namespace Drupal\action\Tests; +namespace Drupal\action_ui\Tests; use Drupal\simpletest\WebTestBase; /** - * Tests action uninstallation. - * - * @see \Drupal\action\Plugin\views\field\BulkForm + * Tests Action UI uninstallation. */ class ActionUninstallTest extends WebTestBase { @@ -21,13 +19,13 @@ class ActionUninstallTest extends WebTestBase { * * @var array */ - public static $modules = array('views', 'action'); + public static $modules = array('views', 'action_ui'); public static function getInfo() { return array( - 'name' => 'Uninstall action test', - 'description' => 'Tests that uninstalling actions does not remove other module\'s actions.', - 'group' => 'Action', + 'name' => 'Uninstall Action UI test', + 'description' => "Tests that uninstalling Action UI does not remove other module's actions.", + 'group' => 'Action UI', ); } @@ -35,7 +33,7 @@ public static function getInfo() { * Tests Action uninstall. */ public function testActionUninstall() { - \Drupal::moduleHandler()->uninstall(array('action')); + \Drupal::moduleHandler()->uninstall(array('action_ui')); $this->assertTrue(entity_load('action', 'user_block_user_action', TRUE), 'Configuration entity \'user_block_user_action\' still exists after uninstalling action module.' ); diff --git a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php b/core/modules/action_ui/lib/Drupal/action_ui/Tests/ConfigurationTest.php similarity index 92% rename from core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php rename to core/modules/action_ui/lib/Drupal/action_ui/Tests/ConfigurationTest.php index 97448ae..2d89941 100644 --- a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php +++ b/core/modules/action_ui/lib/Drupal/action_ui/Tests/ConfigurationTest.php @@ -2,10 +2,10 @@ /** * @file - * Definition of Drupal\action\Tests\ConfigurationTest. + * Contains \Drupal\action_ui\Tests\ConfigurationTest. */ -namespace Drupal\action\Tests; +namespace Drupal\action_ui\Tests; use Drupal\Component\Utility\Crypt; use Drupal\simpletest\WebTestBase; @@ -20,13 +20,13 @@ class ConfigurationTest extends WebTestBase { * * @var array */ - public static $modules = array('action'); + public static $modules = array('action_ui'); public static function getInfo() { return array( 'name' => 'Actions configuration', 'description' => 'Tests complex actions configuration by adding, editing, and deleting a complex action.', - 'group' => 'Action', + 'group' => 'Action UI', ); } @@ -40,7 +40,7 @@ function testActionConfiguration() { // Make a POST request to admin/config/system/actions. $edit = array(); - $edit['action'] = Crypt::hashBase64('action_goto_action'); + $edit['action'] = Crypt::hashBase64('system_goto_action'); $this->drupalPostForm('admin/config/system/actions', $edit, t('Create')); $this->assertResponse(200); @@ -50,7 +50,7 @@ function testActionConfiguration() { $edit['label'] = $action_label; $edit['id'] = strtolower($action_label); $edit['url'] = 'admin'; - $this->drupalPostForm('admin/config/system/actions/add/' . Crypt::hashBase64('action_goto_action'), $edit, t('Save')); + $this->drupalPostForm('admin/config/system/actions/add/' . Crypt::hashBase64('system_goto_action'), $edit, t('Save')); $this->assertResponse(200); // Make sure that the new complex action was saved properly. diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml b/core/modules/action_ui/tests/action_bulk_test/action_bulk_test.info.yml similarity index 92% rename from core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml rename to core/modules/action_ui/tests/action_bulk_test/action_bulk_test.info.yml index f9e78fa..ca0fe97 100644 --- a/core/modules/action/tests/action_bulk_test/action_bulk_test.info.yml +++ b/core/modules/action_ui/tests/action_bulk_test/action_bulk_test.info.yml @@ -6,5 +6,5 @@ version: VERSION core: 8.x hidden: true dependencies: - - action + - action_ui - views diff --git a/core/modules/action/tests/action_bulk_test/action_bulk_test.module b/core/modules/action_ui/tests/action_bulk_test/action_bulk_test.module similarity index 100% rename from core/modules/action/tests/action_bulk_test/action_bulk_test.module rename to core/modules/action_ui/tests/action_bulk_test/action_bulk_test.module diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action_ui/tests/action_bulk_test/config/views.view.test_bulk_form.yml similarity index 100% rename from core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml rename to core/modules/action_ui/tests/action_bulk_test/config/views.view.test_bulk_form.yml diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php index ea892c8..166be21 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php @@ -19,7 +19,7 @@ class CommentActionsTest extends CommentTestBase { * * @var array */ - public static $modules = array('dblog', 'action'); + public static $modules = array('dblog'); public static function getInfo() { return array( diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/system/lib/Drupal/system/Plugin/Action/EmailAction.php similarity index 97% rename from core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php rename to core/modules/system/lib/Drupal/system/Plugin/Action/EmailAction.php index a924861..090ff1b 100644 --- a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php +++ b/core/modules/system/lib/Drupal/system/Plugin/Action/EmailAction.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\Plugin\Action\EmailAction. + * Contains \Drupal\system\Plugin\Action\EmailAction. */ -namespace Drupal\action\Plugin\Action; +namespace Drupal\system\Plugin\Action; use Drupal\Core\Action\ConfigurableActionBase; use Drupal\Core\Entity\EntityManagerInterface; @@ -17,7 +17,7 @@ * Sends an e-mail message. * * @Action( - * id = "action_send_email_action", + * id = "system_send_email_action", * label = @Translation("Send e-mail"), * type = "system" * ) diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php b/core/modules/system/lib/Drupal/system/Plugin/Action/GotoAction.php similarity index 96% rename from core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php rename to core/modules/system/lib/Drupal/system/Plugin/Action/GotoAction.php index e596f24..348f220 100644 --- a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php +++ b/core/modules/system/lib/Drupal/system/Plugin/Action/GotoAction.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\Plugin\Action\GotoAction. + * Contains \Drupal\system\Plugin\Action\GotoAction. */ -namespace Drupal\action\Plugin\Action; +namespace Drupal\system\Plugin\Action; use Drupal\Core\Action\ConfigurableActionBase; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -19,7 +19,7 @@ * Redirects to a different URL. * * @Action( - * id = "action_goto_action", + * id = "system_goto_action", * label = @Translation("Redirect to URL"), * type = "system" * ) diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php b/core/modules/system/lib/Drupal/system/Plugin/Action/MessageAction.php similarity index 94% rename from core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php rename to core/modules/system/lib/Drupal/system/Plugin/Action/MessageAction.php index c2591b9..b84c38d 100644 --- a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php +++ b/core/modules/system/lib/Drupal/system/Plugin/Action/MessageAction.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\action\Plugin\Action\MessageAction. + * Contains \Drupal\system\Plugin\Action\MessageAction. */ -namespace Drupal\action\Plugin\Action; +namespace Drupal\system\Plugin\Action; use Drupal\Component\Utility\Xss; use Drupal\Core\Action\ConfigurableActionBase; @@ -17,7 +17,7 @@ * Sends a message to the current user's screen. * * @Action( - * id = "action_message_action", + * id = "system_message_action", * label = @Translation("Display a message to the user"), * type = "system" * ) diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 4fd03af..2600dc1 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -1566,29 +1566,10 @@ function system_update_8020() { } /** - * Enable the Actions module. + * Enable the Action UI module. */ function system_update_8021() { - // Enable the module without re-installing the schema. - \Drupal::moduleHandler()->install(array('action')); - // Rename former System module actions. - $map = array( - 'system_message_action' => 'action_message_action', - 'system_send_email_action' => 'action_send_email_action', - 'system_goto_action' => 'action_goto_action', - ); - foreach ($map as $old => $new) { - // Rename all references to the action callback. - db_update('actions') - ->fields(array('callback' => $new)) - ->condition('callback', $old) - ->execute(); - // Rename the action's aid. - db_update('actions') - ->fields(array('aid' => $new)) - ->condition('aid', $old) - ->execute(); - } + \Drupal::moduleHandler()->install(array('action_ui')); } /** @@ -1851,9 +1832,7 @@ function system_update_8039() { * @ingroup config_upgrade */ function system_update_8040() { - update_variables_to_config('action.settings', array( - 'actions_max_stack' => 'recursion_limit', - )); + db_delete('variable')->condition('name', 'actions_max_stack')->execute(); } /** diff --git a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/BulkFormTest.php similarity index 96% rename from core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php rename to core/modules/views/lib/Drupal/views/Tests/Handler/BulkFormTest.php index dcce0c7..dbe21dc 100644 --- a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/BulkFormTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\action\Tests\BulkFormTest. + * Contains \Drupal\views\Tests\Handler\BulkFormTest. */ -namespace Drupal\action\Tests; +namespace Drupal\views\Handler\Tests; use Drupal\simpletest\WebTestBase; /** * Tests the views bulk form test. * - * @see \Drupal\action\Plugin\views\field\BulkForm + * @see \Drupal\views\Plugin\views\field\BulkForm */ class BulkFormTest extends WebTestBase { @@ -27,7 +27,7 @@ public static function getInfo() { return array( 'name' => 'Bulk form', 'description' => 'Tests the views bulk form test.', - 'group' => 'Action', + 'group' => 'Views Handlers', ); }