From 8b37a221603501b97bac0b92e79cec82a6f4c7e7 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 15 Jun 2023 13:08:12 +0000
Subject: [PATCH] revert mvv relevant parts of #2469, fixes #2730
Closes #2730
Merge request studip/studip!1848
---
app/views/fachabschluss/faecher/fach.php | 2 +-
app/views/module/module/modul.php | 4 ++--
app/views/module/module/modulteil.php | 2 +-
app/views/studiengaenge/studiengaenge/studiengang.php | 2 +-
resources/assets/javascripts/mvv.js | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/views/fachabschluss/faecher/fach.php b/app/views/fachabschluss/faecher/fach.php
index b1a5cc6f5b6..40a65aae8b4 100644
--- a/app/views/fachabschluss/faecher/fach.php
+++ b/app/views/fachabschluss/faecher/fach.php
@@ -59,7 +59,7 @@
<li class="mvv-item-list-placeholder"><?= _('Es wurde noch keine verantwortliche Einrichtung angegeben.') ?></li>
<? endif; ?>
<? foreach ($fach->getFachbereiche() as $fachbereich) : ?>
- <li id="fachbereiche_<?= $fachbereich->getId() ?>" class="drag-handle">
+ <li id="fachbereiche_<?= $fachbereich->getId() ?>" class="drag-handle sort_items">
<div class="mvv-item-list-text">
<? if ($fachbereich) : ?>
<?= htmlReady($fachbereich->getDisplayName()) ?>
diff --git a/app/views/module/module/modul.php b/app/views/module/module/modul.php
index c75abdacf5a..af6b3e7ab46 100644
--- a/app/views/module/module/modul.php
+++ b/app/views/module/module/modul.php
@@ -320,7 +320,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] != $display_language) {
<?= _('Geben Sie gegebenenfalls beteiligte Einrichtungen an.') ?>
</li>
<? foreach ($modul->assigned_institutes as $assigned_institute) : ?>
- <li id="institut_<?= $assigned_institute->institut_id ?>" class="drag-handle">
+ <li id="institut_<?= $assigned_institute->institut_id ?>" class="drag-handle sort_items">
<div class="mvv-item-list-text">
<? if ($assigned_institute->institute) : ?>
<?= htmlReady($assigned_institute->institute->Name) ?>
@@ -371,7 +371,7 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] != $display_language) {
</li>
<? endif; ?>
<? foreach ($modul->languages as $assigned_language) : ?>
- <li id="language_<?= $assigned_language->lang ?>" class="drag-handle">
+ <li id="language_<?= $assigned_language->lang ?>" class="drag-handle sort_items">
<div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div>
<div class="mvv-item-list-buttons">
<a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asImg(); ?></a>
diff --git a/app/views/module/module/modulteil.php b/app/views/module/module/modulteil.php
index a89ca674a63..1dcf8fc8171 100644
--- a/app/views/module/module/modulteil.php
+++ b/app/views/module/module/modulteil.php
@@ -139,7 +139,7 @@ if ($GLOBALS['MVV_MODULTEIL']['SPRACHE']['default'] != $display_language) {
</li>
<? endif; ?>
<? foreach ($modulteil->languages as $assigned_language) : ?>
- <li id="language_<?= $assigned_language->lang ?>" class="drag-handle">
+ <li id="language_<?= $assigned_language->lang ?>" class="drag-handle sort_items">
<div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div>
<div class="mvv-item-list-buttons">
<a href="#" class="mvv-item-remove">
diff --git a/app/views/studiengaenge/studiengaenge/studiengang.php b/app/views/studiengaenge/studiengaenge/studiengang.php
index b900e4311ee..6a2f05afc6b 100644
--- a/app/views/studiengaenge/studiengaenge/studiengang.php
+++ b/app/views/studiengaenge/studiengaenge/studiengang.php
@@ -239,7 +239,7 @@ use Studip\Button, Studip\LinkButton;
<?= _('Geben Sie die Lehrsprachen an.') ?>
</li>
<? foreach ($studiengang->languages as $assigned_language) : ?>
- <li id="language_<?= $assigned_language->lang ?>" class="drag-handle">
+ <li id="language_<?= $assigned_language->lang ?>" class="drag-handle sort_items">
<div class="mvv-item-list-text"><?= htmlReady($assigned_language->getDisplayName()) ?></div>
<div class="mvv-item-list-buttons">
<a href="#" class="mvv-item-remove"><?= Icon::create('trash', 'clickable', array('title' => _('Sprache entfernen')))->asImg() ?></a>
diff --git a/resources/assets/javascripts/mvv.js b/resources/assets/javascripts/mvv.js
index 6b5ca4da0cc..12d26532665 100644
--- a/resources/assets/javascripts/mvv.js
+++ b/resources/assets/javascripts/mvv.js
@@ -364,7 +364,7 @@ STUDIP.MVV.Sort = {
},
init: function(target) {
target.sortable({
- items: '> .drag-handle',
+ items: '> .sort_items',
cursor: 'move',
containment: 'parent',
tolerance: 'pointer',
@@ -451,7 +451,7 @@ STUDIP.MVV.Content = {
jQuery('<div class="mvv-item-list-text"/>')
.text(item_name).appendTo(item);
if (target.hasClass('sortable')) {
- item.addClass('drag-handle');
+ item.addClass('drag-handle sort_items');
}
target.children('.mvv-item-list-placeholder').hide();
if (target.hasClass('mvv-assign-single')) {
--
GitLab