diff --git a/app/controllers/news.php b/app/controllers/news.php index e87eeae7e2eb70ab2ff5b26866b83eb1c63c773a..031a3ab14466fe8c2e7c37cf526b552ed546485c 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 25716985f988cd2c7f2e28acbe7388e2b4fec0c0..5ab58ba190a55395e7cc35014946dc73e0eef227 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 77c84958c4dcb469b3e0e8c0704bf8e4daaf91da..bdd34df0f0be4c1873cad5a34af387a2a5602143 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 06c84d60ccb3dfbdd3dd324b4cfec8993822b82b..3b30e5eafee5e338285336903ec172509c1939f1 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 2302bc707dc774dbddde7150f10c1ea0473c3211..ac1fe51f8a55b8f3f4a300efde407cc6a1c97a7c 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>