From b888a36c1256d9db5fdb4a7c9d4eef6825e6b440 Mon Sep 17 00:00:00 2001
From: Lauri Eskola <lauri.eskola@gmail.com>
Date: Fri, 13 Apr 2018 22:37:26 +0300
Subject: [PATCH] Issue #2930274 by dawehner, Berdir, slashrsm, Sam152: View
 mode class is not built correctly in media.html.twig

---
 .../media/tests/src/Functional/MediaUiFunctionalTest.php        | 1 +
 core/themes/classy/templates/content/media.html.twig            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
index c6c1c956be17..3c943120148c 100644
--- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
+++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
@@ -173,6 +173,7 @@ public function testMediaWithMultipleMediaTypes() {
     $this->drupalGet('media/' . $first_media_item->id());
     $assert_session->statusCodeEquals(200);
     $assert_session->pageTextContains($first_media_item->getName());
+    $assert_session->elementsCount('css', '.media--view-mode-full', 1);
 
     // Go to second media item.
     $this->drupalGet('media/' . $second_media_item->id());
diff --git a/core/themes/classy/templates/content/media.html.twig b/core/themes/classy/templates/content/media.html.twig
index 24d3d3a9aab6..422030e9d027 100644
--- a/core/themes/classy/templates/content/media.html.twig
+++ b/core/themes/classy/templates/content/media.html.twig
@@ -17,7 +17,7 @@
     'media',
     'media--type-' ~ media.bundle()|clean_class,
     not media.isPublished() ? 'media--unpublished',
-    view_mode ? 'media--view-mode-' ~ view_mode.id()|clean_class,
+    view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
   ]
 %}
 <article{{ attributes.addClass(classes) }}>
-- 
GitLab