Merge pull request #31 from OS2web/develop

Fixes deployment
OS2web · Jun 10, 2021 · c297869 · c297869
2 parents 6530030 + ac96b01
commit c297869
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 69 deletions.
diff --git a/composer.json b/composer.json
@@ -65,7 +65,7 @@
         "drush/drush": "^9.7.1 | ^10.0.0",
         "mglaman/drupal-check": "^1.1",
         "os2web/os2web": "^1.0",
-        "os2web/os2web_borgerdk": "8.x-dev",
+        "os2web/os2web_borgerdk": "dev-master",
         "os2web/os2web_events": "dev-master",
         "os2web/os2web_hearings": "dev-master",
         "os2web/os2web_logging": "dev-master",

diff --git a/composer.lock b/composer.lock
diff --git a/web/themes/custom/fds_ballerup_theme/templates/node/list/node--os2web-news--list.html.twig b/web/themes/custom/fds_ballerup_theme/templates/node/list/node--os2web-news--list.html.twig
@@ -18,7 +18,7 @@
 
     {{ content.field_os2web_news_article_date }}
 
-    {% set text = content.field_os2web_news_description | render %}
+    {% set text = content.field_os2web_news_intro | render %}
     <div class="field field--type-body">
       {{ text | striptags }}
     </div>

diff --git a/...hemes/custom/fds_ballerup_theme/templates/node/teaser/node--os2web-news--teaser.html.twig b/...hemes/custom/fds_ballerup_theme/templates/node/teaser/node--os2web-news--teaser.html.twig
@@ -17,7 +17,7 @@
     {{ content.field_os2web_news_article_date }}
     {{ content.field_os2web_news_heading }}
 
-    {% set text = content.field_os2web_news_description | render %}
+    {% set text = content.field_os2web_news_intro | render %}
     <div class="field field--type-body">
       {{ text | striptags }}
     </div>