From 63b246063fd5339d76afabcda36aa1c591846104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 5 May 2022 14:47:33 +0200
Subject: [PATCH] Custom Fields not shown on folder level #1348

---
 app/views/dmsf/_description.html.erb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/views/dmsf/_description.html.erb b/app/views/dmsf/_description.html.erb
index f593637d..3c156f0d 100644
--- a/app/views/dmsf/_description.html.erb
+++ b/app/views/dmsf/_description.html.erb
@@ -22,8 +22,17 @@
 
 <% if @project %>
   <div class="dmsf-header">
-      <div class="wiki dmsf-description">
-        <%= textilizable @folder ? @folder.description : @project.dmsf_description %>
-      </div>
+    <div class="wiki dmsf-description">
+      <%= textilizable @folder ? @folder.description : @project.dmsf_description %>
+    </div>
+    <% if @folder && @folder.custom_field_values.any? { |o| o.value.present? } %>
+      <ul>
+        <% render_custom_field_values(@folder) do |custom_field, formatted| %>
+          <li class="<%= custom_field.css_classes %>">
+            <span class="label"><%= custom_field.name %>:</span> <%= formatted %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
   </div>
 <% end %>