wip: improved network list

issue #2144

Author: frankiejol

script/rvd_back

@@ -1342,18 +1342,26 @@ sub upload_group_members($file) {
 sub change_network_forward($rvd_back) {
 
     my $sth = $rvd_back->_dbh->prepare(
-        "SELECT id,id_vm FROM virtual_networks WHERE name=?"
+        "SELECT vn.id, vn.id_vm, vms.name FROM virtual_networks vn, vms "
+        ." WHERE vn.name=?"
+        ."   AND vn.id_vm=vms.id "
     );
 
     die "Error: No network names supplied.\n" if !@ARGV;
 
+    my $n_changed=0;
     for my $name (@ARGV) {
         $sth->execute($name);
-        my ($id_network , $id_vm) = $sth->fetchrow;
+        my ($id_network , $id_vm, $vm_name) = $sth->fetchrow;
+        my ($id_network2 , $id_vm2, $vm_name2) = $sth->fetchrow;
         if (!$id_network) {
             warn "Error: network $name not found.\n";
             next;
         }
+        if ($id_network2) {
+            warn "Error: network $name found on node $vm_name and $vm_name2.\n";
+            next;
+        }
         my $vm = Ravada::VM->open($id_vm);
 
         my ($network) = grep { $_->{id} == $id_network } $vm->list_virtual_networks();
@@ -1362,7 +1370,9 @@ sub change_network_forward($rvd_back) {
             uid => Ravada::Utils::user_daemon->id
             ,data => $network
         );
+        $n_changed++;
     }
+    print "$n_changed networks change requested.\n";
 }
 
 sub DESTROY {

t/vm/bundle.t

@@ -306,4 +306,5 @@ for my $vm_name ( vm_names() ) {
 }
 
 end();
+clean();
 done_testing();

templates/main/admin_networks.html.ep

@@ -18,17 +18,16 @@
         </div>
 
         <div class="row">
-            <div class="col-md-4"><b><%=l 'Name' %></b></div>
+            <div class="col-md-5"><b><%=l 'Name' %></b></div>
             <div class="col-md-1"
                  ng-show="<%= ( $_user->is_admin or $_user->can_manage_all_networks or 0 ) %>"
                 ><b><%=l 'Public' %></b></div>
 
             <div class="col-md-2"
                  ng-show="<%= ( $_user->is_admin or $_user->can_manage_all_networks or 0 ) %>"
                 ><b><%=l 'Owner' %></b></div>
-            <div class="col-md-1"><b><%=l 'Bridge' %></b></div>
             <div class="col-md-2"><b><%=l 'Address' %></b></div>
-            <div class="col-md-1"><b><%=l 'Active' %></b></div>
+            <div class="col-md-1"><b><%=l 'Status' %></b></div>
             <div class="col-md-1"><b><%=l 'Auto Start' %></b></div>
         </div>
 
@@ -41,9 +40,10 @@
         </div>
 
         <div ng-repeat="network in networks | orderObjectBy:'name'"
-             class="row" ng-cloak
+             class="row border" ng-cloak
         >
-            <div class="col-md-4">
+            <div class="col-md-5" align="left">
+
                 <a href="/network/settings/{{network.id}}.html"
                     ng-show="network._can_change">{{network.name}}</a>
                 <span ng-show="!network._can_change">{{network.name}}</span>
@@ -60,14 +60,12 @@
 
             <div class="col-md-2"
                  ng-show="<%= ( $_user->is_admin or $_user->can_manage_all_networks or 0 ) %>"
-                >{{network._owner.name}}</div>
-            <div class="col-md-1">{{network.bridge}}</div>
+                 ><a href="/admin/user/{{network._owner.id}}.html">{{network._owner.name}}</a></div>
             <div class="col-md-2">{{network.ip_address}}</div>
             <div class="col-md-1">
-                <span ng-show="network.is_active"
-                      >&#10004;</span>
-                <span ng-show="!network.is_active"
-                      >&#10005;</span>
+                <span ng-show="network.is_active" class="badge badge-success"><%=l 'active' %></span>
+                <span ng-show="!network.is_active" class="badge badge-danger"><%=l 'down' %></span>
+                <span ng-show="network.forward_mode=='none'" class="badge badge-warning"><%=l 'isolated' %></span>
             </div>
             <div class="col-md-1">
                 <span ng-show="network.autostart"

templates/main/settings_generic.html.ep

@@ -15,12 +15,13 @@
         >
             <div class="card-header">
                 <div class="row">
-                    <div class="col">
+                    <div class="col-10">
                         <span class="title">
-                            <%= $item  %> {{<%= $item %>._old_name}}
+                            <%= $item  %>
+                            {{<%= $item %>._old_name}}
                         </span>
                     </div>
-                    <div class="col" align="right">
+                    <div class="col-2" align="right">
                         <a type="button" class="btn btn-outline-secondary" align="right"
                             href="/admin/<%= $item %>s">back</a>
                     </div>