Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
0c5817ae
Commit
0c5817ae
authored
Jun 15, 2021
by
Francesc Guasch
Browse files
Merge branch 'robertperez-upc-feat/cool_new_branch'
parent
4f67274d
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/Ravada/Front.pm
View file @
0c5817ae
...
...
@@ -143,8 +143,6 @@ sub list_machines_user($self, $user, $access_data={}) {
my
@list
;
while
(
$sth
->
fetch
)
{
next
if
!
$is_public
&&
!
$user
->
is_admin
&&
((
$typeof
)
||
(
$user
->
id
!=
$id_owner
));
next
if
!
$user
->
allowed_access
(
$id
);
# check if enabled settings and this user not allowed
next
if
$bookings_enabled
&&
!
Ravada::Front::
Domain
->
open
(
$id
)
->
allowed_booking
(
$user
);
...
...
script/rvd_front
View file @
0c5817ae
...
...
@@ -3007,6 +3007,11 @@ sub copy_machine {
$owner = undef if (! $USER) || (! $USER->is_admin);
confess "owner do not exists" if ($owner)
&&
(! Ravada::Auth::SQL->new(name => $owner));
$USER = _logged_in($c);
my $owner = $arg->{new_owner};
$owner = undef if (! $USER) || (! $USER->is_admin);
confess "owner do not exists" if ($owner)
&&
(! Ravada::Auth::SQL->new(name => $owner));
my @create_args = ( from_pool => 0 );
push @create_args,( memory => $ram ) if $ram;
push @create_args, ( name => $name ) if !defined $number || $number == 1;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment