Commit 1d753fd4 authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'release/0.6.0'

parents d087e232 56af5df6
......@@ -3,5 +3,22 @@
**Implemented enhancements:**
- Define volume types [\#529]
- User experience acces directly to virtual desktop [\#1145]
- Restrict access using client headers [\#1213]
- Rebase virtual machines [\#1224]
- Change number of virtual CPUs [\#1238]
- Added Kali 2020 to the default ISO list [\#1236]
- Add turkish translation [\#1239]
- Arabic translation [\#1244]
**Bugfixes**
- Anonymous users don't get deleted [\#1023]
- Graphic parameters are removed on remote node base [\#1135]
- Renew mac with 2 devices [\#1232]
**Refactor**
- Turn frontend pulling to websockets [\#1187]
- Save screenshot database [\#1207]
......@@ -1416,7 +1416,7 @@ sub _logged_in {
if ($login) {
$USER = Ravada::Auth::SQL->new(name => $login);
#Mojolicious::Plugin::I18N::
$c->languages($USER->language);
$c->languages($USER->language) if $USER->language();
$c->stash(_logged_in => $login );
$c->stash(_user => $USER);
......
......@@ -275,6 +275,10 @@ sub test_rebase($vm, $swap, $data, $with_cd) {
$base->add_volume(type => 'data', size=>$VOL_SIZE) if $data;
$base->prepare_base(user => user_admin, with_cd => $with_cd);
$base->add_volume(type => 'swap', size=>$VOL_SIZE) if $swap;
$base->add_volume(type => 'data', size=>$VOL_SIZE) if $data;
$base->prepare_base(user => user_admin, with_cd => $with_cd);
my $clone1 = $base->clone( name => new_domain_name, user => user_admin);
my $clone2 = $base->clone( name => new_domain_name, user => user_admin);
......
......@@ -32,6 +32,7 @@
width="260"></a>
</div>
<div class="card-body" id="step2">
<div class="row">
<a type="button" class="btn btn-success" ng-hide="machine.action"
href="/machine/clone/{{machine.id}}.html"><strong><i class="fa fa-play" aria-hidden="true"></i>&nbsp;<%=l 'Start' %></strong></a>
<a type="button" class="btn btn-danger text-white"
......@@ -50,26 +51,26 @@
><%=l 'Yes' %></a>
</div>
<a ng-show="machine.is_active && !machine.action"
class="btn btn-light"
class="btn btn-outline-secondary"
ng-click="machine.action=true;$parent.refresh=20"
type="button"><%=l 'action'%></a>
<div class="btn-group"
ng-show="machine.action && !host_restore"
>
<a type="button" class="btn btn-light btn-sm"
<button type="button" class="btn btn-outline-dark btn-sm"
ng-show="machine.can_remove"
ng-click="host_restore=machine.id_clone"
><%=l 'Restore' %></a>
><%=l 'Restore' %></button>
<a ng-show="machine.is_active" type="button"
class="btn btn-light btn-sm"
<button ng-show="machine.is_active" type="button"
class="btn btn-outline-dark btn-sm"
ng-click="machine.action=false;action(machine,'shutdown')"
><%=l 'Shutdown'%></a>
><%=l 'Shutdown'%></button>
<a ng-show="machine.is_active && machine.can_hibernate" type="button"
class="btn btn-light btn-sm"
<button ng-show="machine.is_active && machine.can_hibernate" type="button"
class="btn btn-outline-dark"
ng-click="machine.action=false;action(machine,'hibernate')"
><%=l 'Hibernate' %></a>
><%=l 'Hibernate' %></button>
<a
ng-click="machine.action=false"
......@@ -80,7 +81,7 @@
<a ng-show="machine.id_clone && !machine.action && host_restore != machine.id_clone"
align="right" href="/machine/manage/{{machine.id_clone}}.html"><i class="fa fa-fw fa-cog" title="<%=l 'Settings' %>"></i></a>
% }
</div>
</div>
</div>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment