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
cf22cb99
Commit
cf22cb99
authored
5 months ago
by
Jan-Hendrik Willms
Browse files
Options
Downloads
Patches
Plain Diff
remove faulty additional field and access to it, fixes #4620
Closes #4620 Merge request
studip/studip!3431
parent
c3805d4d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/classes/InstituteCalendarHelper.php
+7
-7
7 additions, 7 deletions
lib/classes/InstituteCalendarHelper.php
lib/classes/globalsearch/GlobalSearchCourses.php
+1
-1
1 addition, 1 deletion
lib/classes/globalsearch/GlobalSearchCourses.php
lib/models/Course.php
+0
-2
0 additions, 2 deletions
lib/models/Course.php
with
8 additions
and
10 deletions
lib/classes/InstituteCalendarHelper.php
+
7
−
7
View file @
cf22cb99
...
...
@@ -589,7 +589,7 @@ class InstituteCalendarHelper
*
* @return string enriched course info string for tooltip
*/
private
static
function
getCycleInfos
(
$course
,
$cycle_date
)
private
static
function
getCycleInfos
(
Course
$course
,
$cycle_date
)
{
$info_string
=
$course
->
getFullName
(
'number-name'
)
.
"
\n
"
;
...
...
@@ -615,20 +615,20 @@ class InstituteCalendarHelper
if
(
$course
->
getSemClass
()
->
offsetGet
(
'module'
))
{
$mvv_pathes
=
[];
$course_start
=
$course
->
start_time
;
$course_end
=
(
$course
->
end_time
<
0
||
is_null
(
$course
->
end_time
))
?
PHP_INT_MAX
:
$course
->
end_time
;
// set filter to show only pathes with valid semester data
ModuleManagementModelTreeItem
::
setObjectFilter
(
'Modul'
,
function
(
$modul
)
use
(
$course
_start
,
$course_end
)
{
function
(
$modul
)
use
(
$course
)
{
// check for public status
if
(
!
$GLOBALS
[
'MVV_MODUL'
][
'STATUS'
][
'values'
][
$modul
->
stat
][
'public'
])
{
return
false
;
}
$modul_start
=
Semester
::
find
(
$modul
->
start
)
->
beginn
?:
0
;
$modul_end
=
Semester
::
find
(
$modul
->
end
)
->
ende
?:
PHP_INT_MAX
;
return
(
$modul_start
<=
$course_end
&&
$modul_end
>=
$course_start
);
return
$modul_end
>=
$course
->
start_semester
->
beginn
&&
(
$course
->
isOpenEnded
()
||
$modul_start
<=
$course
->
end_semester
->
ende
);
}
);
...
...
This diff is collapsed.
Click to expand it.
lib/classes/globalsearch/GlobalSearchCourses.php
+
1
−
1
View file @
cf22cb99
...
...
@@ -168,7 +168,7 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull
});
}
$result_children
=
[];
foreach
(
$visibleChildren
as
$child
)
{
foreach
(
$visibleChildren
as
$child
)
{
$result_children
[]
=
self
::
filter
(
$child
,
$search
);
}
...
...
This diff is collapsed.
Click to expand it.
lib/models/Course.php
+
0
−
2
View file @
cf22cb99
...
...
@@ -71,7 +71,6 @@
* @property SimpleORMapCollection|Institute[] $institutes has_and_belongs_to_many Institute
* @property SimpleORMapCollection|UserDomain[] $domains has_and_belongs_to_many UserDomain
* @property-read mixed $teachers additional field
* @property mixed $end_time additional field
* @property mixed $start_semester additional field
* @property mixed $end_semester additional field
* @property-read mixed $semester_text additional field
...
...
@@ -273,7 +272,6 @@ class Course extends SimpleORMap implements Range, PrivacyObject, StudipItem, Fe
$config
[
'additional_fields'
][
'teachers'
]
=
[
'get'
=>
'getTeachers'
];
$config
[
'additional_fields'
][
'end_time'
]
=
true
;
$config
[
'additional_fields'
][
'start_semester'
]
=
[
'get'
=>
'getStartSemester'
,
...
...
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