Merge branch 'develop' into feature/video-fullscreen-fix

Author: martinyde

composer.json

@@ -197,6 +197,9 @@
             },
             "drupal/autocomplete_deluxe": {
                 "Fix bug in limitation": "patches/autocomplete_deluxe_fix_limitation_bug.patch"
+            },
+            "drupal/inline_entity_form": {
+                "Fix bug in inline entity form": "https://www.drupal.org/files/issues/2020-11-18/inline_entity_form-required_fields_optional_ief-3099844-15.patch"
             }
         }
     },

composer.lock

@@ -1,26 +1,22 @@
-label: Indhold
-description: 'Find og håndtér indhold.'
 display:
   default:
     display_options:
-      exposed_form:
-        options:
-          reset_button_label: Gendan
-          exposed_sorts_label: 'Sortér efter'
-          sort_asc_label: Stigende
-          sort_desc_label: Faldende
       pager:
         options:
+          expose:
+            items_per_page_label: 'Antal pr. side'
+            items_per_page_options_all_label: '- Alle -'
+            offset_label: Begyndelse
           tags:
             previous: '‹ Forrige'
             next: 'Næste ›'
             first: '« Første'
             last: 'Sidste »'
-          expose:
-            items_per_page_label: 'Antal pr. side'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Begyndelse
       fields:
+        os2loop_shared_subject:
+          label: Emne
+        os2loop_shared_tags:
+          label: Nøgleord
         title:
           label: Titel
         type:
@@ -35,11 +31,15 @@ display:
           label: Opdateret
         operations:
           label: Handlinger
-        os2loop_shared_subject:
-          label: Emne
-        os2loop_shared_tags:
-          label: Nøgleord
       filters:
+        tid:
+          admin_label: Emne
+          expose:
+            label: Emne
+        tid_1:
+          admin_label: Nøgleord
+          expose:
+            label: Nøgleord
         title:
           expose:
             label: Titel
@@ -55,30 +55,20 @@ display:
                 title: Udgivet
               2:
                 title: 'Ikke udgivet'
-        tid:
-          admin_label: Emne
-          expose:
-            label: Emne
-        tid_1:
-          admin_label: Nøgleord
-          expose:
-            label: Nøgleord
+      header:
+        result:
+          content: 'Viser @start - @end af @total'
+      exposed_form:
+        options:
+          reset_button_label: Gendan
+          exposed_sorts_label: 'Sortér efter'
+          sort_asc_label: Stigende
+          sort_desc_label: Faldende
       title: Indhold
       empty:
         area_text_custom:
           content: 'Der er intet indhold at vise.'
-      header:
-        result:
-          content: 'Viser @start - @end af @total'
     display_title: Standard
-  page_1:
-    display_options:
-      menu:
-        title: Indhold
-      tab_options:
-        title: Indhold
-        description: 'Find og håndtér indhold'
-    display_title: Side
   page_2:
     display_options:
       menu:
@@ -109,14 +99,16 @@ display:
             label: Nøgleord
         comment_count:
           expose:
-            label: Besvaret/Ubesvaret
+            label: Besvarelser
           group_info:
-            label: Besvaret/Ubesvaret
+            label: Besvarelser
             group_items:
               2:
-                title: Besvaret
+                title: 'Et svar'
               3:
                 title: Ubesvaret
+              1:
+                title: 'Flere svar'
       fields:
         title:
           label: Titel
@@ -139,3 +131,13 @@ display:
         operations:
           label: Handlinger
     display_title: Spørgsmål/Indlæg
+  page_1:
+    display_options:
+      menu:
+        title: Indhold
+      tab_options:
+        title: Indhold
+        description: 'Find og håndtér indhold'
+    display_title: Side
+label: Indhold
+description: 'Find og håndtér indhold.'

config/sync/language/da/views.view.content.yml

@@ -6,3 +6,4 @@ node_types:
   os2loop_page: 0
   os2loop_question: 0
   os2loop_section_page: 0
+message_template: 'Se mere: [node:url]'

config/sync/os2loop_alert.settings.yml

@@ -165,6 +165,7 @@ permissions:
   - 'oauth authorize any consumers'
   - 'oauth register any consumers'
   - 'opt-in or out of tracking'
+  - 'os2loop see notify users option'
   - 'os2loop send alert'
   - 'publish any os2loop_documents_collection content'
   - 'publish any os2loop_documents_document content'

config/sync/user.role.os2loop_user_administrator.yml

@@ -27,6 +27,7 @@ permissions:
   - 'edit own os2loop_documents_document content'
   - 'flag os2loop_upvote_correct_answer'
   - 'menu view unpublished'
+  - 'os2loop see notify users option'
   - 'os2loop send alert'
   - 'publish any os2loop_documents_collection content'
   - 'publish any os2loop_documents_document content'

config/sync/user.role.os2loop_user_document_collection_editor.yml

@@ -81,21 +81,16 @@ display:
           summary: ''
           description: ''
           columns:
-            node_bulk_form: node_bulk_form
             title: title
             type: type
             name: name
             status: status
             changed: changed
             os2loop_shared_subject: os2loop_shared_subject
             os2loop_shared_tags: os2loop_shared_tags
+            comment_count: comment_count
             operations: operations
           info:
-            node_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
             title:
               sortable: true
               default_sort_order: asc
@@ -143,6 +138,13 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            comment_count:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             operations:
               align: ''
               separator: ''
@@ -3308,11 +3310,18 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items:
-              2:
-                title: 'Has comments'
+              1:
+                title: 'Multiple comments'
                 operator: '>'
                 value:
-                  value: '0'
+                  value: '1'
+                  min: ''
+                  max: ''
+              2:
+                title: 'One comment'
+                operator: '='
+                value:
+                  value: '1'
                   min: ''
                   max: ''
               3:

config/sync/views.view.content.yml

@@ -6,3 +6,4 @@ package: 'OS2Loop'
 
 dependencies:
   - drupal:os2loop_subscriptions
+  - drupal:os2loop_settings

web/profiles/custom/os2loop/modules/os2loop_alert/os2loop_alert.info.yml

@@ -8,6 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\os2loop_alert\Helper\Helper;
+use Drupal\os2loop_settings\Settings;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -26,19 +27,28 @@ class AlertForm extends FormBase {
    */
   protected $helper;
 
+  /**
+   * The config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $config;
+
   /**
    * Constructor.
    */
-  public function __construct(Helper $helper) {
+  public function __construct(Helper $helper, Settings $settings) {
     $this->helper = $helper;
+    $this->config = $settings->getConfig(SettingsForm::SETTINGS_NAME);
   }
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get(Helper::class)
+      $container->get(Helper::class),
+      $container->get(Settings::class)
     );
   }
 
@@ -64,7 +74,6 @@ public function getTitle() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $isPreview = $form_state->getTemporaryValue('is_preview');
     $node = $this->getNode();
     $subject = $this->helper->getSubject($node);
 
@@ -87,6 +96,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#required' => TRUE,
       '#placeholder' => $this->t('Write the message you want to send.'),
       '#description' => $this->t('Use <code>[node:url]</code> to insert the content url (required) and <code>[node:title]</code> to insert the content title. Other useful tokens: <code>[site:name]</code> <code>[site:url]</code>'),
+      '#default_value' => $this->config->get('message_template') ?: SettingsForm::DEFAULT_MESSAGE_TEMPLATE,
     ];
 
     $numberOfUsers = $this->helper->getNumberOfUsers();
@@ -140,6 +150,12 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ],
     ];
 
+    // For some reason the customer does not want to waste time previewing an
+    // important message before sending it …
+    // $isPreview = $form_state->getTemporaryValue('is_preview');.
+    $isPreview = TRUE;
+
+    // @phpstan-ignore-next-line
     if ($isPreview) {
       $form['actions']['send'] = [
         '#name' => 'send',

web/profiles/custom/os2loop/modules/os2loop_alert/src/Form/AlertForm.php

@@ -23,6 +23,13 @@ class SettingsForm extends ConfigFormBase {
    */
   public const SETTINGS_NAME = 'os2loop_alert.settings';
 
+  /**
+   * The default message template.
+   *
+   * @var string
+   */
+  public const DEFAULT_MESSAGE_TEMPLATE = 'Se mere: [node:url]';
+
   /**
    * The settings.
    *
@@ -83,6 +90,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $config->get('node_types') ?: [],
     ];
 
+    $form['message_template'] = [
+      '#type' => 'textarea',
+      '#title' => $this->t('Message template'),
+      '#description' => $this->t('The default message template'),
+      '#default_value' => $config->get('message_template') ?: self::DEFAULT_MESSAGE_TEMPLATE,
+    ];
+
     return parent::buildForm($form, $form_state);
   }
 
@@ -92,6 +106,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->configFactory->getEditable(static::SETTINGS_NAME)
       ->set('node_types', $form_state->getValue('node_types'))
+      ->set('message_template', $form_state->getValue('message_template'))
       ->save();
 
     drupal_flush_all_caches();