Skip to content
Snippets Groups Projects
Commit 2b15768f authored by André Noack's avatar André Noack Committed by Elmar Ludwig
Browse files

Resolve #3071 "Verwaltung von Veranstaltungen: Gesperrte Veranstaltungen...

Resolve #3071 "Verwaltung von Veranstaltungen: Gesperrte Veranstaltungen werden nicht als gesperrt angezeigt"

Closes #3071

Merge request studip/studip!2059
parent 8ae2f854
No related branches found
No related tags found
No related merge requests found
...@@ -556,7 +556,8 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -556,7 +556,8 @@ class Admin_CoursesController extends AuthenticatedController
$d['type'] = $semtype['name']; $d['type'] = $semtype['name'];
} }
if (in_array('room_time', $activated_fields)) { if (in_array('room_time', $activated_fields)) {
$d['room_time'] = Seminar::GetInstance($course->id)->getDatesHTML([ $seminar = new Seminar($course);
$d['room_time'] = $seminar->getDatesHTML([
'show_room' => true, 'show_room' => true,
]) ?: _('nicht angegeben'); ]) ?: _('nicht angegeben');
} }
...@@ -700,11 +701,13 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -700,11 +701,13 @@ class Admin_CoursesController extends AuthenticatedController
case 17: //Gesperrte Veranstaltungen case 17: //Gesperrte Veranstaltungen
$cs = CourseSet::getSetForCourse($course->id); $cs = CourseSet::getSetForCourse($course->id);
if ($cs) { if ($cs) {
$locked = $cs->getId() === CourseSet::getGlobalLockedAdmissionSetId(); $locked = true;
$disabled = !$cs->hasAdmissionRule('LockedAdmission');
} else { } else {
$locked = false; $locked = false;
$disabled = false;
} }
$d['action'] = '<input type="hidden" name="all_sem[]" value="'.htmlReady($course->id).'"><input type="checkbox" name="admission_locked['.$course->getId().']" '.($locked ? 'checked' : '').' value="1" aria-label="'.htmlReady(sprintf(_('Veranstaltung %s sperren'), $course->getFullName())).'">'; $d['action'] = '<input type="hidden" name="all_sem[]" value="'.htmlReady($course->id).'"><input type="checkbox" name="admission_locked['.$course->getId().']" '.($locked ? 'checked' : '').' '.($disabled ? 'disabled' : '').' value="1" aria-label="'.htmlReady(sprintf(_('Veranstaltung %s sperren'), $course->getFullName())).'">';
break; break;
case 18: //Startsemester case 18: //Startsemester
$d['action'] = (string) \Studip\LinkButton::create( $d['action'] = (string) \Studip\LinkButton::create(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment