Merge branch 'develop' of github.com:OS2web/os2web8 into develop

Author: andriyun

composer.lock

@@ -62,7 +62,7 @@ process:
       - createUrlFromNid
     source: nid
   field_os2web_page_intro: field_deck
-  field_os2web_page_heading: field_navn3
+  field_os2web_page_heading: title
   field_os2web_page_section:
     plugin: migration_lookup
     migration: ballerup_d7_taxonomy_section

web/modules/custom/ballerup_d7_migration/config/install/migrate_plus.migration.ballerup_d7_node_gallery_slide.yml

@@ -35,6 +35,12 @@ process:
     default_value: 1
     source: '@migrate_uid'
   status: status
+  moderation_state:
+    plugin: callback
+    callable:
+      - 'Drupal\ballerup_d7_migration\Utility\MigrationHelper'
+      - setModerationState
+    source: status
   created: created
   changed: changed
   #promote: promote

web/modules/custom/ballerup_d7_migration/config/install/migrate_plus.migration.ballerup_d7_node_indholdside.yml

@@ -33,6 +33,13 @@ process:
     plugin: default_value
     default_value: 1
     source: '@migrate_uid'
+  status: status
+  moderation_state:
+    plugin: callback
+    callable:
+      - 'Drupal\ballerup_d7_migration\Utility\MigrationHelper'
+      - setModerationState
+    source: status
   field_migration_old_url:
     plugin: callback
     callable:
@@ -46,7 +53,7 @@ process:
         value: value
         format:
           plugin: default_value
-          default_value: 'wysiwyg_tekst'  
+          default_value: 'wysiwyg_tekst'
   # ...
   field_os2web_page_contact:
     plugin: migration_lookup

web/modules/custom/ballerup_d7_migration/config/install/migrate_plus.migration.ballerup_d7_node_institution_page.yml

@@ -18,6 +18,22 @@ function createUrlFromNid($nid) {
     return MigrationHelper::$siteUrl . '/node/' . $nid;
   }
 
+  /**
+   * Sets the moderation state for the node based on a status.
+   * 
+   * @param $status
+   *
+   * @return string
+   */
+  function setModerationState($status) {
+    if ($status) {
+      return 'published';
+    }
+    else {
+      return 'draft';
+    }
+  }
+
   /**
    * Creates Borger.dk paragraph with the right article selected.
    *

web/modules/custom/ballerup_d7_migration/src/Utility/MigrationHelper.php

@@ -110,7 +110,6 @@
             {% if page.sidebar_second %}
               {% block sidebar_second %}
                 {% if ( not is_front ) %}
-                  <br>
                   <a href="/selvbetjening" class="button button-primary button--selvbetjening">
                     {{ 'Genvej til al Selvbetjening' | trans }} <span class="icon fa fa-angle-right"></span>
                   </a>