Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Stud.IP
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4ab2aba9

Commit 4ab2aba9 authored 2 years ago by Elmar Ludwig Committed by David Siegfried 2 years ago

Downloads
- Patches
- Plain Diff

switch resource locking to check the booking interval, fixes #1350 and #185

Closes #1350 and #185

Merge request studip/studip!834

parent b997da75

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/resources/admin.php 1 addition, 19 deletions

app/controllers/resources/admin.php
app/routes/Resources.php 1 addition, 1 deletion

app/routes/Resources.php
app/views/resources/admin/global_locks.php 2 additions, 11 deletions

app/views/resources/admin/global_locks.php
app/views/resources/admin/user_permissions.php 0 additions, 25 deletions

app/views/resources/admin/user_permissions.php
lib/models/resources/GlobalResourceLock.class.php 3 additions, 9 deletions

lib/models/resources/GlobalResourceLock.class.php
lib/models/resources/Resource.class.php 25 additions, 46 deletions

lib/models/resources/Resource.class.php
lib/models/resources/ResourceBooking.class.php 1 addition, 1 deletion

lib/models/resources/ResourceBooking.class.php
lib/raumzeit/SingleDate.class.php 1 addition, 1 deletion

lib/raumzeit/SingleDate.class.php
lib/resources/ResourceManager.class.php 0 additions, 10 deletions

lib/resources/ResourceManager.class.php

with 34 additions and 123 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment