Skip to content
Snippets Groups Projects
Commit b506b133 authored by Peter Thienel's avatar Peter Thienel
Browse files

Resolve "Externe Seiten: Die Sichbarkeit von Veranstaltungen wird an weiteren...

Resolve "Externe Seiten: Die Sichbarkeit von Veranstaltungen wird an weiteren Stellen nicht berücksichtigt"

Closes #4231

Merge request studip/studip!3063
parent a01e9fc7
No related branches found
No related tags found
No related merge requests found
Pipeline #23988 passed
...@@ -32,7 +32,7 @@ class ExternPagePersBrowse extends ExternPage ...@@ -32,7 +32,7 @@ class ExternPagePersBrowse extends ExternPage
/** /**
* @see ExternPage::getDataFields() * @see ExternPage::getDataFields()
* @param array $classes * @param array $classes
* @return array * @return array
*/ */
...@@ -343,6 +343,7 @@ class ExternPagePersBrowse extends ExternPage ...@@ -343,6 +343,7 @@ class ExternPagePersBrowse extends ExternPage
LEFT JOIN auth_user_md5 aum ON su.user_id = aum.user_id LEFT JOIN auth_user_md5 aum ON su.user_id = aum.user_id
WHERE ui.Institut_id = ? WHERE ui.Institut_id = ?
AND su.status = 'dozent' AND su.status = 'dozent'
AND s.visible = 1
AND ui.externdefault = 1 AND ui.externdefault = 1
AND " . get_ext_vis_query() . " AND " . get_ext_vis_query() . "
AND ui.inst_perms = 'dozent' AND ui.inst_perms = 'dozent'
......
...@@ -146,7 +146,8 @@ class ExternPagePersonDetails extends ExternPage ...@@ -146,7 +146,8 @@ class ExternPagePersonDetails extends ExternPage
LEFT JOIN `seminar_user` USING(`seminar_id`) LEFT JOIN `seminar_user` USING(`seminar_id`)
LEFT JOIN `sem_types` LEFT JOIN `sem_types`
ON `sem_types`.`id` = `seminare`.`status` ON `sem_types`.`id` = `seminare`.`status`
WHERE `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`) WHERE `seminare`.`visible` = 1
AND `semester_courses`.`semester_id` IN (:semester_ids) OR ISNULL(`semester_id`)
AND `seminar_user`.`user_id` = :user_id AND `seminar_user`.`user_id` = :user_id
AND `seminar_user`.`status` = 'dozent' AND `seminar_user`.`status` = 'dozent'
AND `sem_types`.`class` IN (:semclasses)"; AND `sem_types`.`class` IN (:semclasses)";
......
...@@ -119,7 +119,11 @@ class ExternPageTimetable extends ExternPage ...@@ -119,7 +119,11 @@ class ExternPageTimetable extends ExternPage
LEFT JOIN `seminar_inst` LEFT JOIN `seminar_inst`
ON `seminare`.`Seminar_id` = `seminar_inst`.`Seminar_id`"; ON `seminare`.`Seminar_id` = `seminar_inst`.`Seminar_id`";
$query .= " $query .= "
WHERE (`termine`.`date` >= :start AND `termine`.`date` <= :end) " WHERE (
`seminare`.`visible` = 1
AND termine`.`date` >= :start
AND `termine`.`date` <= :end
)"
. $this->getEventTypeSQL($params) . $this->getEventTypeSQL($params)
. $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids) . $this->getScopesSQL($params, $this->studyareas, (bool) $this->scope_kids)
. $this->getInstitutesSQL($params) . $this->getInstitutesSQL($params)
......
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