diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
index fea8cc1..5ed1908 100644
--- a/core/modules/comment/comment.routing.yml
+++ b/core/modules/comment/comment.routing.yml
@@ -2,7 +2,7 @@ comment.admin:
path: '/admin/content/comment'
defaults:
_title: 'Comments'
- _controller: '\Drupal\comment\Controller\AdminController::adminPage'
+ _form: 'Drupal\comment\Form\CommentAdminOverview'
type: 'new'
requirements:
_permission: 'administer comments'
@@ -11,7 +11,7 @@ comment.admin_approval:
path: '/admin/content/comment/approval'
defaults:
_title: 'Unapproved comments'
- _controller: '\Drupal\comment\Controller\AdminController::adminPage'
+ _form: 'Drupal\comment\Form\CommentAdminOverview'
type: 'approval'
requirements:
_permission: 'administer comments'
@@ -50,6 +50,14 @@ entity.comment.delete_form:
requirements:
_entity_access: 'comment.delete'
+comment.multiple_delete_confirm:
+ path: '/admin/content/comment/delete'
+ defaults:
+ _title: 'Delete'
+ _form: '\Drupal\comment\Form\ConfirmDeleteMultiple'
+ requirements:
+ _permission: 'administer comments'
+
comment.reply:
path: '/comment/reply/{entity_type}/{entity}/{field_name}/{pid}'
defaults:
diff --git a/core/modules/comment/config/install/system.action.comment_delete_action.yml b/core/modules/comment/config/install/system.action.comment_delete_action.yml
new file mode 100644
index 0000000..89dd7c9
--- /dev/null
+++ b/core/modules/comment/config/install/system.action.comment_delete_action.yml
@@ -0,0 +1,9 @@
+id: comment_delete_action
+label: 'Delete comment'
+status: true
+langcode: en
+type: comment
+plugin: comment_delete_action
+dependencies:
+ module:
+ - comment
diff --git a/core/modules/comment/config/optional/views.view.comment.yml b/core/modules/comment/config/optional/views.view.comment.yml
new file mode 100644
index 0000000..2a704a8
--- /dev/null
+++ b/core/modules/comment/config/optional/views.view.comment.yml
@@ -0,0 +1,764 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - comment
+ - user
+id: comment
+label: Comments
+module: comment
+description: 'Find and manage comments.'
+tag: ''
+base_table: comment_field_data
+base_field: cid
+core: 8.x
+display:
+ default:
+ display_plugin: default
+ id: default
+ display_title: Master
+ position: 1
+ display_options:
+ access:
+ type: perm
+ options:
+ perm: 'administer comments'
+ cache:
+ type: none
+ query:
+ type: views_query
+ options:
+ disable_sql_rewrite: false
+ distinct: false
+ replica: false
+ query_comment: ''
+ query_tags: { }
+ exposed_form:
+ type: basic
+ options:
+ submit_button: Apply
+ reset_button: false
+ reset_button_label: Reset
+ exposed_sorts_label: 'Sort by'
+ expose_sort_order: true
+ sort_asc_label: Asc
+ sort_desc_label: Desc
+ pager:
+ type: full
+ options:
+ items_per_page: 50
+ offset: 0
+ id: 0
+ total_pages: null
+ tags:
+ previous: '‹ previous'
+ next: 'next ›'
+ first: '« first'
+ last: 'last »'
+ expose:
+ items_per_page: false
+ items_per_page_label: 'Items per page'
+ items_per_page_options: '5, 10, 25, 50'
+ items_per_page_options_all: false
+ items_per_page_options_all_label: '- All -'
+ offset: false
+ offset_label: Offset
+ quantity: 9
+ style:
+ type: table
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ override: true
+ sticky: true
+ caption: ''
+ summary: ''
+ description: ''
+ columns:
+ comment_bulk_form: comment_bulk_form
+ subject: subject
+ name: name
+ changed: changed
+ edit_comment: edit_comment
+ delete_comment: delete_comment
+ dropbutton: dropbutton
+ info:
+ comment_bulk_form:
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ subject:
+ sortable: true
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ name:
+ sortable: true
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: priority-medium
+ changed:
+ sortable: true
+ default_sort_order: desc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: priority-low
+ edit_comment:
+ sortable: false
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ delete_comment:
+ sortable: false
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ dropbutton:
+ sortable: false
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ default: changed
+ empty_table: true
+ row:
+ type: fields
+ fields:
+ comment_bulk_form:
+ id: comment_bulk_form
+ table: comment
+ field: comment_bulk_form
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ action_title: 'Update Options'
+ include_exclude: include
+ selected_actions:
+ - comment_delete_action
+ - comment_unpublish_action
+ plugin_id: comment_bulk_form
+ entity_type: comment
+ subject:
+ id: subject
+ table: comment_field_data
+ field: subject
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: Subject
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ click_sort_column: value
+ type: string
+ settings:
+ link_to_entity: true
+ group_column: value
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ entity_type: comment
+ entity_field: subject
+ plugin_id: field
+ name:
+ id: name
+ table: comment_field_data
+ field: name
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: Author
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ click_sort_column: value
+ type: comment_username
+ settings: { }
+ group_column: value
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ entity_type: comment
+ entity_field: name
+ plugin_id: field
+ commented_entity_label:
+ id: commented_entity_label
+ table: comment
+ field: commented_entity_label
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: 'Posted in'
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ link_to_entity: true
+ entity_type: comment
+ plugin_id: commented_entity_label
+ changed:
+ id: changed
+ table: comment_field_data
+ field: changed
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: Updated
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ date_format: short
+ custom_date_format: ''
+ timezone: ''
+ entity_type: comment
+ entity_field: changed
+ plugin_id: date
+ edit_comment:
+ id: edit_comment
+ table: comment
+ field: edit_comment
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: true
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ text: edit
+ entity_type: comment
+ plugin_id: entity_link_edit
+ delete_comment:
+ id: delete_comment
+ table: comment
+ field: delete_comment
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: true
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ text: delete
+ entity_type: comment
+ plugin_id: entity_link_delete
+ dropbutton:
+ id: dropbutton
+ table: views
+ field: dropbutton
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: Opertaions
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ fields:
+ delete_comment: delete_comment
+ edit_comment: edit_comment
+ comment_bulk_form: '0'
+ subject: '0'
+ name: '0'
+ changed: '0'
+ destination: true
+ plugin_id: dropbutton
+ filters:
+ status:
+ id: status
+ table: comment_field_data
+ field: status
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: '='
+ value: true
+ group: 1
+ exposed: false
+ expose:
+ operator_id: ''
+ label: ''
+ description: ''
+ use_operator: false
+ operator: ''
+ identifier: ''
+ required: false
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ entity_type: comment
+ entity_field: status
+ plugin_id: boolean
+ sorts:
+ changed:
+ id: changed
+ table: comment_field_data
+ field: changed
+ relationship: none
+ group_type: group
+ admin_label: ''
+ order: DESC
+ exposed: false
+ expose:
+ label: ''
+ granularity: second
+ entity_type: comment
+ entity_field: changed
+ plugin_id: date
+ title: Comments
+ header: { }
+ footer: { }
+ empty:
+ area_text_custom:
+ id: area_text_custom
+ table: views
+ field: area_text_custom
+ relationship: none
+ group_type: group
+ admin_label: ''
+ empty: true
+ tokenize: false
+ content: 'No comments available.'
+ plugin_id: text_custom
+ arguments: { }
+ display_extenders: { }
+ use_more: false
+ use_more_always: true
+ use_more_text: more
+ use_ajax: false
+ hide_attachment_summary: false
+ show_admin_links: true
+ group_by: false
+ css_class: ''
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ cacheable: false
+ page_1:
+ display_plugin: page
+ id: page_1
+ display_title: 'Published Comments'
+ position: 1
+ display_options:
+ path: admin/content/comment
+ menu:
+ type: tab
+ title: Comments
+ description: 'Comments published'
+ parent: ''
+ weight: 0
+ context: '0'
+ menu_name: admin
+ display_description: ''
+ display_extenders: { }
+ exposed_block: false
+ display_comment: ''
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ cacheable: false
+ page_2:
+ display_plugin: page
+ id: page_2
+ display_title: 'Unapproved Comments'
+ position: 2
+ display_options:
+ path: admin/content/comment/approval
+ menu:
+ type: tab
+ title: 'Unapproved comments'
+ description: 'Comments unapproved'
+ parent: ''
+ weight: 1
+ context: '0'
+ menu_name: admin
+ display_description: ''
+ filters:
+ status:
+ id: status
+ table: comment_field_data
+ field: status
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: '='
+ value: false
+ group: 1
+ exposed: false
+ expose:
+ operator_id: ''
+ label: ''
+ description: ''
+ use_operator: false
+ operator: ''
+ identifier: ''
+ required: false
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ entity_type: comment
+ entity_field: status
+ plugin_id: boolean
+ defaults:
+ filters: false
+ filter_groups: false
+ fields: true
+ filter_groups:
+ operator: AND
+ groups:
+ 1: AND
+ display_extenders: { }
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ cacheable: false
diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml
index d9f5a77..0503651 100644
--- a/core/modules/comment/config/schema/comment.schema.yml
+++ b/core/modules/comment/config/schema/comment.schema.yml
@@ -102,3 +102,7 @@ field.field_settings.comment:
preview:
type: integer
label: 'Preview comment'
+
+action.configuration.comment_delete_action:
+ type: action_configuration_default
+ label: 'Delete comment configuration'
diff --git a/core/modules/comment/config/schema/comment.views.schema.yml b/core/modules/comment/config/schema/comment.views.schema.yml
index 606af82..9b59207 100644
--- a/core/modules/comment/config/schema/comment.views.schema.yml
+++ b/core/modules/comment/config/schema/comment.views.schema.yml
@@ -16,6 +16,18 @@ views.field.comment_entity_link:
type: boolean
label: 'Show teaser-style link'
+views.field.comment_bulk_form:
+ type: views_field_bulk_form
+ label: 'Comment bulk form'
+
+views.field.commented_entity_label:
+ type: views_field
+ label: 'Commented entity label'
+ mapping:
+ link_to_entity:
+ type: boolean
+ label: 'Link to entity'
+
views.field.comment_last_timestamp:
type: views.field.date
label: 'Last comment date'
diff --git a/core/modules/comment/src/CommentViewsData.php b/core/modules/comment/src/CommentViewsData.php
index c70f77f..49bbbd4 100644
--- a/core/modules/comment/src/CommentViewsData.php
+++ b/core/modules/comment/src/CommentViewsData.php
@@ -118,6 +118,22 @@ public function getViewsData() {
),
);
+ $data['comment']['commented_entity_label'] = array(
+ 'title' => t('Label of commented entity'),
+ 'help' => t('Provide a label of commented entity.'),
+ 'field' => array(
+ 'id' => 'commented_entity_label',
+ ),
+ );
+
+ $data['comment']['comment_bulk_form'] = array(
+ 'title' => t('Comment operations bulk form'),
+ 'help' => t('Add a form element that lets you run operations on multiple comments.'),
+ 'field' => array(
+ 'id' => 'comment_bulk_form',
+ ),
+ );
+
$data['comment_field_data']['thread']['field'] = array(
'title' => t('Depth'),
'help' => t('Display the depth of the comment if it is threaded.'),
diff --git a/core/modules/comment/src/Controller/AdminController.php b/core/modules/comment/src/Controller/AdminController.php
index 4c1592f..76becb8 100644
--- a/core/modules/comment/src/Controller/AdminController.php
+++ b/core/modules/comment/src/Controller/AdminController.php
@@ -10,6 +10,7 @@
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\Request;
+use Drupal\comment\CommentManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -18,32 +19,29 @@
class AdminController extends ControllerBase {
/**
- * The form builder.
+ * Constructs an AdminController object.
*
- * @var \Drupal\Core\Form\FormBuilderInterface
+ * @param \Drupal\comment\CommentManagerInterface $comment_manager
+ * The comment manager service.
+ * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
+ * The form builder.
*/
- protected $formBuilder;
+ public function __construct(CommentManagerInterface $comment_manager, FormBuilderInterface $form_builder) {
+ $this->commentManager = $comment_manager;
+ $this->formBuilder = $form_builder;
+ }
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
+ $container->get('comment.manager'),
$container->get('form_builder')
);
}
/**
- * Constructs an AdminController object.
- *
- * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
- * The form builder.
- */
- public function __construct(FormBuilderInterface $form_builder) {
- $this->formBuilder = $form_builder;
- }
-
- /**
* Presents an administrative comment listing.
*
* @param \Symfony\Component\HttpFoundation\Request $request
diff --git a/core/modules/comment/src/Form/CommentAdminOverview.php b/core/modules/comment/src/Form/CommentAdminOverview.php
index 008e0bb..b40660c 100644
--- a/core/modules/comment/src/Form/CommentAdminOverview.php
+++ b/core/modules/comment/src/Form/CommentAdminOverview.php
@@ -10,12 +10,14 @@
use Drupal\comment\CommentInterface;
use Drupal\comment\CommentStorageInterface;
use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Cache\Cache;
use Drupal\Core\Datetime\DateFormatter;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Url;
+use Drupal\user\PrivateTempStoreFactory;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -52,6 +54,13 @@ class CommentAdminOverview extends FormBase {
protected $moduleHandler;
/**
+ * The tempstore factory.
+ *
+ * @var \Drupal\user\PrivateTempStoreFactory
+ */
+ protected $tempStoreFactory;
+
+ /**
* Creates a CommentAdminOverview form.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
@@ -62,12 +71,15 @@ class CommentAdminOverview extends FormBase {
* The date formatter service.
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler.
+ * @param \Drupal\user\PrivateTempStoreFactory $temp_store_factory
+ * The tempstore factory.
*/
- public function __construct(EntityManagerInterface $entity_manager, CommentStorageInterface $comment_storage, DateFormatter $date_formatter, ModuleHandlerInterface $module_handler) {
+ public function __construct(EntityManagerInterface $entity_manager, CommentStorageInterface $comment_storage, DateFormatter $date_formatter, ModuleHandlerInterface $module_handler, PrivateTempStoreFactory $temp_store_factory) {
$this->entityManager = $entity_manager;
$this->commentStorage = $comment_storage;
$this->dateFormatter = $date_formatter;
$this->moduleHandler = $module_handler;
+ $this->tempStoreFactory = $temp_store_factory;
}
/**
@@ -78,7 +90,8 @@ public static function create(ContainerInterface $container) {
$container->get('entity.manager'),
$container->get('entity.manager')->getStorage('comment'),
$container->get('date.formatter'),
- $container->get('module_handler')
+ $container->get('module_handler'),
+ $container->get('user.private_tempstore')
);
}
@@ -262,23 +275,33 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
public function submitForm(array &$form, FormStateInterface $form_state) {
$operation = $form_state->getValue('operation');
$cids = $form_state->getValue('comments');
-
- foreach ($cids as $cid) {
- // Delete operation handled in \Drupal\comment\Form\ConfirmDeleteMultiple
- // see \Drupal\comment\Controller\AdminController::adminPage().
- if ($operation == 'unpublish') {
- $comment = $this->commentStorage->load($cid);
- $comment->setPublished(FALSE);
- $comment->save();
- }
- elseif ($operation == 'publish') {
- $comment = $this->commentStorage->load($cid);
- $comment->setPublished(TRUE);
- $comment->save();
+ if ($operation != 'delete') {
+ foreach ($cids as $cid) {
+ // Delete operation handled in
+ // \Drupal\comment\Form\ConfirmDeleteMultiple
+ // @see \Drupal\comment\Controller\AdminController::adminPage().
+ if ($operation == 'unpublish') {
+ $comment = $this->commentStorage->load($cid);
+ $comment->setPublished(FALSE);
+ $comment->save();
+ }
+ elseif ($operation == 'publish') {
+ $comment = $this->commentStorage->load($cid);
+ $comment->setPublished(TRUE);
+ $comment->save();
+ }
}
+ drupal_set_message($this->t('The update has been performed.'));
+ $form_state->setRedirect('comment.admin');
+ Cache::invalidateTags(['content']);
+ }
+ else {
+ $this->tempStoreFactory
+ ->get('comment_multiple_delete_confirm')
+ ->set($this->currentUser()->id(),
+ $this->commentStorage->loadMultiple($cids));
+ $form_state->setRedirect('comment.multiple_delete_confirm');
}
- drupal_set_message($this->t('The update has been performed.'));
- $form_state->setRedirect('comment.admin');
}
}
diff --git a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
index 666b555..9d990f4 100644
--- a/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
+++ b/core/modules/comment/src/Form/ConfirmDeleteMultiple.php
@@ -8,6 +8,7 @@
namespace Drupal\comment\Form;
use Drupal\comment\CommentStorageInterface;
+use Drupal\user\PrivateTempStoreFactory;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Form\ConfirmFormBase;
use Drupal\Core\Form\FormStateInterface;
@@ -20,6 +21,13 @@
class ConfirmDeleteMultiple extends ConfirmFormBase {
/**
+ * The tempstore factory.
+ *
+ * @var \Drupal\user\PrivateTempStoreFactory
+ */
+ protected $tempStoreFactory;
+
+ /**
* The comment storage.
*
* @var \Drupal\comment\CommentStorageInterface
@@ -38,9 +46,12 @@ class ConfirmDeleteMultiple extends ConfirmFormBase {
*
* @param \Drupal\comment\CommentStorageInterface $comment_storage
* The comment storage.
+ * @param \Drupal\user\PrivateTempStoreFactory $temp_store_factory
+ * The tempstore factory.
*/
- public function __construct(CommentStorageInterface $comment_storage) {
+ public function __construct(CommentStorageInterface $comment_storage, PrivateTempStoreFactory $temp_store_factory) {
$this->commentStorage = $comment_storage;
+ $this->tempStoreFactory = $temp_store_factory;
}
/**
@@ -48,7 +59,8 @@ public function __construct(CommentStorageInterface $comment_storage) {
*/
public static function create(ContainerInterface $container) {
return new static(
- $container->get('entity.manager')->getStorage('comment')
+ $container->get('entity.manager')->getStorage('comment'),
+ $container->get('user.private_tempstore')
);
}
@@ -63,7 +75,7 @@ public function getFormId() {
* {@inheritdoc}
*/
public function getQuestion() {
- return $this->t('Are you sure you want to delete these comments and all their children?');
+ return $this->formatPlural(count($this->comments), 'Are you sure you want to delete this comment and all its children?', 'Are you sure you want to delete these comments and all their children?');
}
/**
@@ -77,23 +89,24 @@ public function getCancelUrl() {
* {@inheritdoc}
*/
public function getConfirmText() {
- return $this->t('Delete comments');
+ return $this->t('Delete');
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
- $edit = $form_state->getUserInput();
+ $this->comments = $this->tempStoreFactory->get('comment_multiple_delete_confirm')->get($this->currentUser()->id());
+ if (empty($this->comments)) {
+ return $this->redirect('comment.admin');
+ }
$form['comments'] = array(
'#prefix' => '',
'#tree' => TRUE,
);
- // array_filter() returns only elements with actual values.
- $comment_counter = 0;
- $this->comments = $this->commentStorage->loadMultiple(array_keys(array_filter($edit['comments'])));
+
foreach ($this->comments as $comment) {
$cid = $comment->id();
$form['comments'][$cid] = array(
@@ -102,15 +115,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#prefix' => '',
'#suffix' => SafeMarkup::checkPlain($comment->label()) . ''
);
- $comment_counter++;
}
$form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
- if (!$comment_counter) {
- drupal_set_message($this->t('There do not appear to be any comments to delete, or your selected comment was deleted by another administrator.'));
- $form_state->setRedirect('comment.admin');
- }
-
return parent::buildForm($form, $form_state);
}
@@ -118,9 +125,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- if ($form_state->getValue('confirm')) {
+ if ($form_state->getValue('confirm') && !empty($this->comments)) {
$this->commentStorage->delete($this->comments);
- $count = count($form_state->getValue('comments'));
+ $this->tempStoreFactory->get('comment_multiple_delete_confirm')->delete($this->currentUser()->id());
+ $count = count($this->comments);
$this->logger('content')->notice('Deleted @count comments.', array('@count' => $count));
drupal_set_message($this->formatPlural($count, 'Deleted 1 comment.', 'Deleted @count comments.'));
}
diff --git a/core/modules/comment/src/Plugin/Action/DeleteComment.php b/core/modules/comment/src/Plugin/Action/DeleteComment.php
new file mode 100644
index 0000000..29a23b9
--- /dev/null
+++ b/core/modules/comment/src/Plugin/Action/DeleteComment.php
@@ -0,0 +1,95 @@
+currentUser = $current_user;
+ $this->tempStore = $temp_store_factory->get('comment_multiple_delete_confirm');
+ parent::__construct($configuration, $plugin_id, $plugin_definition);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return new static(
+ $configuration,
+ $plugin_id,
+ $plugin_definition,
+ $container->get('user.private_tempstore'),
+ $container->get('current_user')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function executeMultiple(array $entities) {
+ $this->tempStore->set($this->currentUser->id(), $entities);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function execute($entity = NULL) {
+ $this->executeMultiple(array($entity));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+ /** @var \Drupal\comment\CommentInterface $object */
+ return $object->access('delete', $account, $return_as_object);
+ }
+
+}
diff --git a/core/modules/comment/src/Plugin/views/field/CommentBulkForm.php b/core/modules/comment/src/Plugin/views/field/CommentBulkForm.php
new file mode 100644
index 0000000..e4b691f
--- /dev/null
+++ b/core/modules/comment/src/Plugin/views/field/CommentBulkForm.php
@@ -0,0 +1,26 @@
+t('No comments selected.');
+ }
+
+}
diff --git a/core/modules/comment/src/Plugin/views/field/CommentedEntityLabel.php b/core/modules/comment/src/Plugin/views/field/CommentedEntityLabel.php
new file mode 100644
index 0000000..13764b5
--- /dev/null
+++ b/core/modules/comment/src/Plugin/views/field/CommentedEntityLabel.php
@@ -0,0 +1,135 @@
+entityManager = $manager;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return new static(
+ $configuration,
+ $plugin_id,
+ $plugin_definition,
+ $container->get('entity.manager')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function defineOptions() {
+ $options = parent::defineOptions();
+ $options['link_to_entity'] = array('default' => FALSE);
+ return $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+ $form['link_to_entity'] = array(
+ '#title' => $this->t('Link to entity'),
+ '#description' => $this->t('Make entity label a link to entity page.'),
+ '#type' => 'checkbox',
+ '#default_value' => !empty($this->options['link_to_entity']),
+ );
+ parent::buildOptionsForm($form, $form_state);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render(ResultRow $values) {
+ /** @var \Drupal\comment\CommentInterface $comment */
+ if(($comment = $values->_entity) && isset($this->loadedCommentedEntities[$comment->getCommentedEntityTypeId()]) && isset($this->loadedCommentedEntities[$comment->getCommentedEntityTypeId()][$comment->getCommentedEntityId()])) {
+
+ /** @var $entity \Drupal\Core\Entity\EntityInterface */
+ $entity = $this->loadedCommentedEntities[$comment->getCommentedEntityTypeId()][$comment->getCommentedEntityId()];
+
+ if (!empty($this->options['link_to_entity'])) {
+ $this->options['alter']['make_link'] = TRUE;
+ $this->options['alter']['url'] = $entity->urlInfo();
+ }
+
+ return $this->sanitizeValue($entity->label());
+ }
+ return '';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function preRender(&$values) {
+ parent::preRender($values);
+
+ $entity_ids_per_type = array();
+ /** @var \Drupal\views\ResultRow $value */
+ foreach ($values as $value) {
+ /** @var \Drupal\comment\CommentInterface $entity */
+ if ($entity = $value->_entity) {
+ $entity_ids_per_type[$entity->getCommentedEntityTypeId()][] = $entity->getCommentedEntityId();
+ }
+ }
+
+ foreach ($entity_ids_per_type as $type => $ids) {
+ $this->loadedCommentedEntities[$type] = $this->entityManager->getStorage($type)->loadMultiple($ids);
+ }
+ }
+
+}
diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/src/Tests/CommentAdminTest.php
index ee03405..4bba7b8 100644
--- a/core/modules/comment/src/Tests/CommentAdminTest.php
+++ b/core/modules/comment/src/Tests/CommentAdminTest.php
@@ -87,7 +87,7 @@ function testApprovalAdminInterface() {
);
$this->drupalPostForm(NULL, $edit, t('Update'));
$this->assertText(t('Are you sure you want to delete these comments and all their children?'), 'Confirmation required.');
- $this->drupalPostForm(NULL, $edit, t('Delete comments'));
+ $this->drupalPostForm(NULL, $edit, t('Delete'));
$this->assertText(t('No comments available.'), 'All comments were deleted.');
// Test message when no comments selected.
$edit = array(
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index d3cd089..265d2fa 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -222,7 +222,7 @@ function performCommentOperation($comment, $operation, $approval = FALSE) {
$this->drupalPostForm('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
if ($operation == 'delete') {
- $this->drupalPostForm(NULL, array(), t('Delete comments'));
+ $this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
}
else {
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php
index 8ebc4e7..46d174e 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -347,7 +347,7 @@ function performCommentOperation(CommentInterface $comment, $operation, $approva
$this->drupalPostForm('admin/content/comment' . ($approval ? '/approval' : ''), $edit, t('Update'));
if ($operation == 'delete') {
- $this->drupalPostForm(NULL, array(), t('Delete comments'));
+ $this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertRaw(\Drupal::translation()->formatPlural(1, 'Deleted 1 comment.', 'Deleted @count comments.'), format_string('Operation "@operation" was performed on comment.', array('@operation' => $operation)));
}
else {
diff --git a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
index 8c5456c..b3fcd50 100644
--- a/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
@@ -81,7 +81,8 @@ public function testConstructor() {
$definition['title'] = '';
$options = array();
- $node_bulk_form = new NodeBulkForm(array(), 'node_bulk_form', $definition, $entity_storage);
+ $form_error = $this->getMock('Drupal\Core\Form\FormErrorInterface');
+ $node_bulk_form = new NodeBulkForm(array(), 'node_bulk_form', $definition, $entity_storage, $form_error);
$node_bulk_form->init($executable, $display, $options);
$this->assertAttributeEquals(array_slice($actions, 0, -1, TRUE), 'actions', $node_bulk_form);
diff --git a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
index 0c389cd..9ba5c7f 100644
--- a/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
+++ b/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
@@ -81,7 +81,8 @@ public function testConstructor() {
$definition['title'] = '';
$options = array();
- $user_bulk_form = new UserBulkForm(array(), 'user_bulk_form', $definition, $entity_storage);
+ $form_error = $this->getMock('Drupal\Core\Form\FormErrorInterface');
+ $user_bulk_form = new UserBulkForm(array(), 'user_bulk_form', $definition, $entity_storage, $form_error);
$user_bulk_form->init($executable, $display, $options);
$this->assertAttributeEquals(array_slice($actions, 0, -1, TRUE), 'actions', $user_bulk_form);
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 4ef5091..a058a45 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -100,6 +100,15 @@ protected function setUp() {
'field_name' => 'comment'
);
entity_create('comment', $comment)->save();
+
+ $unpublished_comment = array(
+ 'uid' => $user->id(),
+ 'status' => CommentInterface::NOT_PUBLISHED,
+ 'entity_id' => $node->id(),
+ 'entity_type' => 'node',
+ 'field_name' => 'comment'
+ );
+ entity_create('comment', $unpublished_comment)->save();
}
// Some views, such as the "Who's Online" view, only return results if at