Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Eibrink-Lunzenauer
Stud.IP
Commits
b59bf23b
Commit
b59bf23b
authored
9 months ago
by
Peter Thienel
Browse files
Options
Downloads
Patches
Plain Diff
use and show only visible courses, fixes #4231
parent
a01e9fc7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/extern/ExternPagePersBrowse.php
+2
-1
2 additions, 1 deletion
lib/extern/ExternPagePersBrowse.php
lib/extern/ExternPagePersonDetails.php
+2
-1
2 additions, 1 deletion
lib/extern/ExternPagePersonDetails.php
lib/extern/ExternPageTimetable.php
+5
-1
5 additions, 1 deletion
lib/extern/ExternPageTimetable.php
with
9 additions
and
3 deletions
lib/extern/ExternPagePersBrowse.php
+
2
−
1
View file @
b59bf23b
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
lib/extern/ExternPagePersonDetails.php
+
2
−
1
View file @
b59bf23b
...
@@ -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)"
;
...
...
This diff is collapsed.
Click to expand it.
lib/extern/ExternPageTimetable.php
+
5
−
1
View file @
b59bf23b
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment