From 183aa90c311f54fd46767e9e6c7d998f0ba05b13 Mon Sep 17 00:00:00 2001 From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de> Date: Fri, 11 Aug 2023 17:41:45 +0200 Subject: [PATCH] Revert "re #2365" This reverts commit f0ce6fb3cf70201651409a43be88b7709c47ae02. --- app/controllers/news.php | 2 +- lib/classes/forms/NewsRangesInput.php | 1 - resources/assets/stylesheets/scss/forms.scss | 4 ---- resources/vue/components/EditableList.vue | 19 ++----------------- templates/forms/news_ranges_input.php | 2 -- 5 files changed, 3 insertions(+), 25 deletions(-) diff --git a/app/controllers/news.php b/app/controllers/news.php index e87eeae7e2e..031a3ab1446 100644 --- a/app/controllers/news.php +++ b/app/controllers/news.php @@ -375,7 +375,7 @@ class NewsController extends StudipController 'legend' => _('In weiteren Bereichen anzeigen'), 'fields' => [ 'news_ranges' => [ - 'label' => _('In weiteren Bereichen anzeigen'), + 'label' => _('Bereich auswählen'), 'type' => 'NewsRanges', 'required' => true ] diff --git a/lib/classes/forms/NewsRangesInput.php b/lib/classes/forms/NewsRangesInput.php index 25716985f98..5ab58ba190a 100644 --- a/lib/classes/forms/NewsRangesInput.php +++ b/lib/classes/forms/NewsRangesInput.php @@ -56,7 +56,6 @@ class NewsRangesInput extends Input $template = $GLOBALS['template_factory']->open('forms/news_ranges_input'); $template->name = $this->name; - $template->title = $this->title; $template->items = $items; $template->searchtype = new \NewsRangesSearch(); $template->selectable = $selectable; diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss index 77c84958c4d..bdd34df0f0b 100644 --- a/resources/assets/stylesheets/scss/forms.scss +++ b/resources/assets/stylesheets/scss/forms.scss @@ -444,10 +444,6 @@ form.default { margin-top: 0.5ex; } - .hiddenpart { - display: none; - } - //hidden radio buttons with icon: input[type="radio"].hidden-checkbox, input[type="checkbox"].hidden-checkbox { diff --git a/resources/vue/components/EditableList.vue b/resources/vue/components/EditableList.vue index 06c84d60ccb..3b30e5eafee 100644 --- a/resources/vue/components/EditableList.vue +++ b/resources/vue/components/EditableList.vue @@ -1,19 +1,13 @@ <template> <div> - <div class="hiddenpart"> - <label class="hiddeninput" v-if="required && sortedItems.length === 0"> - <span class="textlabel">{{ label }}</span> - <input type="text" required :value="items.map(x => x.value).join('|')"> - </label> - </div> <div class="formpart"> <ul class="clean editablelist"> <li v-for="item in sortedItems" :key="item.id" :data-type="item.type"> - <studip-icon v-if="item.icon" :shape="item.icon" role="info" :size="20" class="text-bottom" alt=""></studip-icon> + <studip-icon v-if="item.icon" :shape="item.icon" role="info" size="20" class="text-bottom" alt=""></studip-icon> <input v-if="name" type="hidden" :name="name + '[]'" :value="item.value"> <span>{{item.name}}</span> <button v-if="item.deletable" @click.prevent="deleteItem(item)" :title="$gettextInterpolate($gettext('%{ name } löschen'), {name: item.name})" class="undecorated"> - <studip-icon shape="trash" role="clickable" :size="20" class="text-bottom"></studip-icon> + <studip-icon shape="trash" role="clickable" size="20" class="text-bottom"></studip-icon> </button> </li> </ul> @@ -63,15 +57,6 @@ export default { type: Array, required: false, default: () => [], - }, - required: { - required: false, - type: Boolean, - default: false - }, - label: { - type: String, - required: false } }, data () { diff --git a/templates/forms/news_ranges_input.php b/templates/forms/news_ranges_input.php index 2302bc707dc..ac1fe51f8a5 100644 --- a/templates/forms/news_ranges_input.php +++ b/templates/forms/news_ranges_input.php @@ -3,7 +3,5 @@ :items="<?= htmlReady(json_encode($items)) ?>" :selectable="<?= htmlReady(json_encode($selectable)) ?>" :category_order="<?= htmlReady(json_encode($category_order)) ?>" - :required="STUDIPFORM_REQUIRED.indexOf('<?= htmlReady($this->name) ?>') !== -1" - label="<?= htmlReady($this->title) ?>" @input="output => <?= htmlReady($this->name) ?> = output"> </editable-list> -- GitLab