From ef38202ede2a7366028cf9fe6e6f9ebcfd1cd91a Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Mon, 15 Nov 2021 14:39:39 +0100
Subject: [PATCH] remove some legacy DB field getters, fixes #420

---
 app/views/admin/datafields/config.php  | 6 +++---
 app/views/admin/datafields/preview.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/datafields/config.php b/app/views/admin/datafields/config.php
index 417996f6ec5..ae3fa971547 100644
--- a/app/views/admin/datafields/config.php
+++ b/app/views/admin/datafields/config.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('admin/datafields/config/' . $struct->getID()) ?>" method="post" class="default">
+<form action="<?= $controller->url_for('admin/datafields/config/' . $struct->id) ?>" method="post" class="default">
     <?= CSRFProtection::tokenTag() ?>
 
     <fieldset>
@@ -6,13 +6,13 @@
 
         <label>
             <?= _('Inhalte') ?>
-            <textarea name="typeparam"><?="\n"?><?= htmlReady(rtrim($struct->getTypeParam()), false) ?></textarea>
+            <textarea name="typeparam"><?="\n"?><?= htmlReady(rtrim($struct->typeparam), false) ?></textarea>
         </label>
     </fieldset>
 
     <footer data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'store') ?>
         <?= Studip\Button::create(_('Vorschau'), 'preview', ['data-dialog' => 'size=auto']) ?>
-        <?= Studip\LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/datafields/index/' . $struct->getObjectType() . '#' . $struct->getObjectType())) ?>
+        <?= Studip\LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/datafields/index/' . $struct->object_type . '#' . $struct->object_type)) ?>
     </footer>
 </form>
diff --git a/app/views/admin/datafields/preview.php b/app/views/admin/datafields/preview.php
index 27792fe778d..9980d0ce20b 100644
--- a/app/views/admin/datafields/preview.php
+++ b/app/views/admin/datafields/preview.php
@@ -1,7 +1,7 @@
-<form action="<?= $controller->url_for('admin/datafields/config/' . $struct->getID()) ?>" method="post" class="default">
+<form action="<?= $controller->url_for('admin/datafields/config/' . $struct->id) ?>" method="post" class="default">
     <?= CSRFProtection::tokenTag() ?>
 
-    <input type="hidden" name="typeparam" value="<?= htmlReady(rtrim($struct->getTypeParam()), false) ?>">
+    <input type="hidden" name="typeparam" value="<?= htmlReady(rtrim($struct->typeparam), false) ?>">
 
     <fieldset>
         <legend><?= _('Vorschau') ?></legend>
@@ -12,6 +12,6 @@
     <footer data-dialog-button>
         <?= Studip\Button::createAccept(_('Speichern'), 'store') ?>
         <?= Studip\Button::create(_('Bearbeiten'), 'edit', ['data-dialog' => 'size=auto']) ?>
-        <?= Studip\LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/datafields/index/' . $struct->getObjectType() . '#' . $struct->getObjectType())) ?>
+        <?= Studip\LinkButton::createCancel(_('Abbrechen'), $controller->url_for('admin/datafields/index/' . $struct->object_type . '#' . $struct->object_type)) ?>
     </footer>
 </form>
-- 
GitLab