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
Jan-Hendrik Willms
Stud.IP
Commits
61003a1e
Commit
61003a1e
authored
2 years ago
by
Elmar Ludwig
Committed by
David Siegfried
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
pass only existing dates to room request, fixes #1214
Closes #1214 Merge request
studip/studip!723
parent
5dedf466
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/course/timesrooms.php
+14
-3
14 additions, 3 deletions
app/controllers/course/timesrooms.php
lib/models/resources/ResourceRequest.class.php
+3
-3
3 additions, 3 deletions
lib/models/resources/ResourceRequest.class.php
with
17 additions
and
6 deletions
app/controllers/course/timesrooms.php
+
14
−
3
View file @
61003a1e
...
...
@@ -697,13 +697,24 @@ class Course_TimesroomsController extends AuthenticatedController
/**
*
*
Creates a new room request for the selected dates.
*/
protected
function
requestStack
(
$cycle_id
)
{
$this
->
cycle_id
=
$cycle_id
;
$appointment_ids
=
[];
foreach
(
$_SESSION
[
'_checked_dates'
]
as
$appointment_id
)
{
if
(
CourseDate
::
exists
(
$appointment_id
))
{
$appointment_ids
[]
=
$appointment_id
;
}
}
if
(
!
$appointment_ids
)
{
PageLayout
::
postError
(
_
(
'Es wurden keine gültigen Termin-IDs übergeben!'
));
$this
->
relocate
(
'course/timesrooms/index'
,
[
'contentbox_open'
=>
$cycle_id
]);
return
;
}
$appointment_ids
=
$_SESSION
[
'_checked_dates'
];
$this
->
redirect
(
'course/room_requests/request_start'
,
[
...
...
This diff is collapsed.
Click to expand it.
lib/models/resources/ResourceRequest.class.php
+
3
−
3
View file @
61003a1e
...
...
@@ -1428,11 +1428,11 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
return
sprintf
(
_
(
'Einzeltermine (%sx)'
),
count
(
$this
->
appointments
));
}
}
elseif
(
count
(
$this
->
appointments
)
==
1
)
{
if
(
$short
)
{
$date
=
$this
->
appointments
[
0
]
->
appointment
;
if
(
$short
||
!
$date
)
{
return
_
(
'Einzeltermin'
);
}
else
{
return
sprintf
(
_
(
'Einzeltermin (%s)'
),
$this
->
appointments
[
0
]
->
appointment
->
getFullname
());
return
sprintf
(
_
(
'Einzeltermin (%s)'
),
$date
->
getFullname
());
}
}
elseif
(
$this
->
date
)
{
if
(
$short
)
{
...
...
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