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
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Uni Osnabrück
Stud.IP
Commits
0900eca9
Commit
0900eca9
authored
Aug 3, 2021
by
André Noack
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue_34' into 'main'
fix
#34
Closes
#34
See merge request
studip/studip!6
parents
7ac8e622
b495f251
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/views/course/room_requests/index.php
+6
-19
6 additions, 19 deletions
app/views/course/room_requests/index.php
with
6 additions
and
19 deletions
app/views/course/room_requests/index.php
+
6
−
19
View file @
0900eca9
...
@@ -66,24 +66,11 @@ echo $flash['message'];
...
@@ -66,24 +66,11 @@ echo $flash['message'];
)
?>
)
?>
<?php
<?php
$user_has_permissions
=
false
;
if
(
$rr
->
room
&&
!
$GLOBALS
[
'perm'
]
->
have_perm
(
'root'
))
{
$user_has_permissions
=
(
$rr
->
room
->
userHasPermission
(
$current_user
,
'admin'
)
&&
(
RoomRequest
::
countBySql
(
"id = :request_id
AND closed = '0'
AND user_id = :user_id"
,
[
'request_id'
=>
$rr
->
id
,
'user_id'
=>
$current_user
->
id
]
)
>
0
)
);
}
else
{
$user_has_permissions
=
ResourceManager
::
userHasGlobalPermission
(
$current_user
,
'admin'
);
$user_has_permissions
=
ResourceManager
::
userHasGlobalPermission
(
$current_user
,
'admin'
);
}
?>
if
(
$rr
->
room
&&
!
$user_has_permissions
)
{
$user_has_permissions
=
$rr
->
room
->
userHasPermission
(
$current_user
,
'admin'
);
}
?>
<?
if
(
$user_has_permissions
&&
(
int
)
$rr
->
closed
===
0
)
:
?>
<?
if
(
$user_has_permissions
&&
(
int
)
$rr
->
closed
===
0
)
:
?>
<?
$actionMenu
->
addLink
(
<?
$actionMenu
->
addLink
(
...
...
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