Merge branch 'cjuan-develop' into develop

lib/Ravada/Front.pm

@@ -506,9 +506,9 @@ sub list_vms($self, $type=undef) {
         $row->{bases}= $self->_list_bases_vm($row->{id});
         $row->{machines}= $self->_list_machines_vm($row->{id});
         $row->{type} = $row->{vm_type};
-        $row->{action_remove} = 'disabled' if length defined $row->{machines}[0] > 0;
+        $row->{action_remove} = 'disabled' if length defined $row->{machines}[0];
         $row->{action_remove} = 'disabled' if $row->{hostname} eq 'localhost';
-        $row->{action_remove} = 'disabled' if length defined $row->{bases}[0] > 0;
+        $row->{action_remove} = 'disabled' if length defined $row->{bases}[0];
         $row->{is_local} = 0;
         $row->{is_local} = 1  if $row->{hostname} =~ /^(localhost|127)/;
         delete $row->{vm_type};

templates/main/admin_nodes.html.ep

@@ -65,6 +65,7 @@
                           <i class="fa fa-window-close"></i>
                     </button>
                     <button type="button" class="btn btn-danger btn-sm {{node.action_remove}}"
+                         ng-disabled="node.action_remove == 'disabled'"
                          ng-click="node_remove(node.id)"
                          title="<%=l 'Remove' %>">
                           <i class="fa fa-trash"></i>

templates/main/list_bases_ng.html.ep

@@ -12,7 +12,7 @@
 %= include 'main/list_bases_ng_head'
     <!--MACHINES SELECTION-->
     <div class="card-body">
-    <div ng-repeat="machine in machines"
+    <div ng-repeat="machine in machines | orderBy: 'id_clone'"
          class="col-sm-4 d-inline-block mb-2"
                 ng-show="machine.is_public || (!machine.is_public && !only_public)">
         <div class="card card-success">