From 2a5370c77b1e740ec6350b7c633c2b0ff1fbef93 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 24 Nov 2022 09:48:55 +0000
Subject: fixes #1810

Closes #1810

Merge request studip/studip!1190
---
 app/views/course/members/additional.php      | 36 ++++++++++++++++------------
 lib/models/AuxLockRule.php                   | 11 ++++++---
 resources/assets/stylesheets/scss/forms.scss |  6 -----
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/views/course/members/additional.php b/app/views/course/members/additional.php
index d1af456..0c79458 100644
--- a/app/views/course/members/additional.php
+++ b/app/views/course/members/additional.php
@@ -1,34 +1,40 @@
-<? if (!empty($aux['rows'])) : ?>
-    <form method="post" action="<?= $controller->url_for('course/members/store_additional')?>">
+<?php
+/**
+ * @var array $aux
+ * @var Course_MembersController $controller
+ */
+?>
+<? if (count($aux['rows']) === 0) : ?>
+    <?= MessageBox::info(_('Keine Zusatzangaben oder Teilnehmende vorhanden.')) ?>
+<? else : ?>
+    <form method="post" action="<?= $controller->store_additional() ?>">
         <?= CSRFProtection::tokenTag()?>
-        <table class="default hide_datafield_title">
+        <table class="default">
             <caption><?= _('Zusatzangaben bearbeiten') ?></caption>
             <thead>
-            <tr>
+                <tr>
                 <? foreach ($aux['head'] as $head): ?>
                     <th><?= htmlReady($head) ?></th>
                 <? endforeach; ?>
-            </tr>
+                </tr>
             </thead>
             <tbody>
             <? foreach ($aux['rows'] as $entry): ?>
                 <tr>
-                    <? foreach ($aux['head'] as $key => $value): ?>
-                        <td><?= $key === 'name' ? htmlReady($entry[$key]) : $entry[$key] ?></td>
-                    <? endforeach; ?>
+                <? foreach ($aux['head'] as $key => $value): ?>
+                    <td><?= $key === 'name' ? htmlReady($entry[$key]) : $entry[$key] ?></td>
+                <? endforeach; ?>
                 </tr>
             <? endforeach; ?>
             </tbody>
             <tfoot>
-            <tr>
-                <td colspan="<?= count($aux['head']) ?>">
-                    <?= \Studip\Button::create(_('Speichern'), 'save') ?>
-                </td>
-            </tr>
+                <tr>
+                    <td colspan="<?= count($aux['head']) ?>">
+                        <?= Studip\Button::create(_('Speichern'), 'save') ?>
+                    </td>
+                </tr>
             </tfoot>
 
         </table>
     </form>
-<? else : ?>
-    <?= MessageBox::info(_('Keine Zusatzangaben oder Teilnehmende vorhanden.')) ?>
 <? endif ?>
diff --git a/lib/models/AuxLockRule.php b/lib/models/AuxLockRule.php
index 15d3762..d0686a9 100644
--- a/lib/models/AuxLockRule.php
+++ b/lib/models/AuxLockRule.php
@@ -108,7 +108,12 @@ class AuxLockRule extends SimpleORMap
         ];
 
         // start collecting entries
-        $result['head']['name'] = _('Name');
+        $result = [
+            'head' => [
+                'name' => _('Name'),
+            ],
+            'rows' => [],
+        ];
 
         // get all autors and users
         foreach ($course->members->findBy('status', ['autor', 'user'])->orderBy('nachname,vorname') as $member) {
@@ -120,7 +125,7 @@ class AuxLockRule extends SimpleORMap
                 // if standard get it from the mapping else get it from the datafield
                 if ($mapping[$field]) {
                     $result['head'][$field] = $head_mapping[$field];
-                    $new[$field] = $mapping[$field];
+                    $new[$field] = htmlReady($mapping[$field]);
                 } else {
                     $datafield = $this->getDatafield($member, $field);
                     if ($datafield && current($datafield)->isVisible()) {
@@ -128,7 +133,7 @@ class AuxLockRule extends SimpleORMap
                         if (!$display_only && current($datafield)->isEditable() && $this->datafieldCache[$field]->object_type == 'usersemdata') {
                             $new[$field] = current($datafield)->getHTML($member->user_id);
                         } else {
-                            $new[$field] = current($datafield)->getDisplayValue(false);
+                            $new[$field] = htmlReady(current($datafield)->getDisplayValue(false));
                         }
                     }
                 }
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index ad39aa3..4e1bec0 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -542,12 +542,6 @@ form.narrow {
     }
 }
 
-table.hide_datafield_title {
-    .datafield_title {
-        display: none;
-    }
-}
-
 .content-title {
     background-color: transparent;
     padding-top: 0;
-- 
cgit v1.0