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
5e6afef6
Commit
5e6afef6
authored
Feb 22, 2021
by
Roberto P. Rubio
Browse files
Do not confirms stops if machine already running
parent
c106222c
Changes
3
Hide whitespace changes
Inline
Side-by-side
public/js/ravada.js
View file @
5e6afef6
...
...
@@ -126,7 +126,7 @@
$scope
.
action
=
function
(
machine
,
action
,
confirmed
)
{
machine
.
action
=
false
;
if
(
action
==
'
start
'
)
{
if
(
!
confirmed
)
{
if
(
(
!
confirmed
)
&&
(
!
machine
.
is_active
))
{
$scope
.
checkMaxMachines
(
action
,
machine
);
}
else
{
window
.
location
.
assign
(
'
/machine/clone/
'
+
machine
.
id
+
'
.html
'
);
...
...
script/rvd_front
View file @
5e6afef6
...
...
@@ -2716,7 +2716,7 @@ sub get_execution_machines_limit_per_current_user {
my %grants = $USER->grants();
my $start_limit = ((exists($grants{'start_limit'}))
&&
($grants{'start_limit'} > 0)) ? $grants{'start_limit'} : $RAVADA->settings_global()->{'backend'}->{'start_limit'}->{'value'};
my $can_start_many = $USER->can_start_many;
my $can_start_many = $USER->can_start_many
? 1 : 0
;
my @running_domains;
foreach my $domain (@{$RAVADA->list_domains( id_owner => $USER->id )})
...
...
templates/main/list_bases_ng.html.ep
View file @
5e6afef6
...
...
@@ -19,15 +19,16 @@
<div
class=
"card-header"
id=
"step1"
>
<h3
class=
"card-title"
>
<a
class=
"btn btn-link"
href=
"/machine/clone/{{machine.id}}.html"
href=
""
ng-click=
"action(machine, 'start'); false"
role=
"button"
>
{{machine.name}}
</a>
<i
ng-show=
"!machine.is_public"
><i
class=
"far fa-eye-slash fa-xs"
title=
"<%=l 'not public' %>"
></i></i>
</h3>
<div
class=
"container"
>
<a
ng-show=
"machine.screenshot"
href=
"/machine/clone/{{machine.id}}.html
"
><img
<a
ng-show=
"machine.screenshot"
ng-click=
"action(machine, 'start')
"
><img
ng-src=
"data:image/png;base64,{{machine.screenshot}}"
alt=
"{{machine.name}}"
class=
"img-thumbnail"
width=
"260"
></a>
<a
ng-show=
"!machine.screenshot"
href=
"/machine/clone/{{machine.id}}.html
"
><img
<a
ng-show=
"!machine.screenshot"
ng-click=
"action(machine, 'start')
"
><img
src=
"/img/default_screenshot.png"
class=
"screenshot-default img-thumbnail"
alt=
"{{machine.name}}"
width=
"260"
></a>
...
...
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