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
62531145
Commit
62531145
authored
2 years ago
by
Viktoria Wiebe
Committed by
Elmar Ludwig
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
biest #1072
Closes #1072 Merge request
studip/studip!682
parent
eb24dbc3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/models/resources/ResourceBooking.class.php
+3
-7
3 additions, 7 deletions
lib/models/resources/ResourceBooking.class.php
with
3 additions
and
7 deletions
lib/models/resources/ResourceBooking.class.php
+
3
−
7
View file @
62531145
...
...
@@ -445,13 +445,6 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
);
}
if
((
!
$this
->
booking_user_id
)
||
!
(
$this
->
booking_user
instanceof
User
))
{
/*throw new InvalidArgumentException(
_('Die buchende Person wurde nicht gesetzt!')
);*/
$this
->
booking_user
=
User
::
findCurrent
();
}
if
(
$this
->
begin
>=
$this
->
end
)
{
throw
new
InvalidArgumentException
(
_
(
'Der Startzeitpunkt darf nicht hinter dem Endzeitpunkt liegen!'
)
...
...
@@ -471,6 +464,9 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
}
}
// update the booking user
$this
->
booking_user
=
User
::
findCurrent
();
//Check if the user has booking rights on the resource.
//The user must have either permanent permissions or they have to
//have booking rights by a temporary permission in this moment
...
...
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