Skip to content

Commit c50a3f5

Browse files
committed
wip: coping with logged out
1 parent bc8f240 commit c50a3f5

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

lib/Ravada.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5781,7 +5781,7 @@ sub _cmd_refresh_machine($self, $request) {
57815781
$domain->remove(Ravada::Utils::user_daemon);
57825782
return;
57835783
}
5784-
$domain->_fetch_networking_mode();
5784+
$domain->_fetch_networking_mode() if $domain->is_known();
57855785
}
57865786
$domain->info($user);
57875787
$domain->client_status(1) if $is_active;

lib/Ravada/WebSocket.pm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ sub _list_machines($rvd, $args) {
155155
unless $user->can_view_admin_machines;
156156

157157
$args->{_list_machines_time} = 0 if !$args->{_list_machines_time};
158+
$args->{_list_machines_last} = 0 if !$args->{_list_machines_last};
159+
158160
$args->{_list_machines_time}++;
159161

160162
if ($args->{_list_machines_time} == 1 ) {

public/js/admin.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,9 @@ ravadaApp.directive("solShowMachine", swMach)
375375
$scope.n_active_hidden = 0;
376376
var action = data0.action;
377377
var data = data0.data;
378+
if (typeof(data) == 'undefined') {
379+
return;
380+
}
378381
if(action == 'new' || Object.keys($scope.list_machines).length==0) {
379382
$scope.list_machines.length = data.length;
380383
for (var i=0, iLength = data.length; i<iLength; i++){
@@ -424,6 +427,8 @@ ravadaApp.directive("solShowMachine", swMach)
424427
if (mach2.id_base>0) { $scope.n_clones++ }
425428
}
426429
}
430+
431+
$http.get("/logout.json");
427432
}
428433
var n_active_current = 0;
429434

script/rvd_front

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,11 @@ any '/test' => sub {
359359
);
360360
};
361361

362+
any '/logout.json' => sub($c) {
363+
logout($c);
364+
return $c->render(json => {logout => '1'});
365+
};
366+
362367
any '/logout' => sub {
363368
my $c = shift;
364369
my $redirect_to = logout($c);
@@ -604,7 +609,7 @@ get '/list_nodes_by_id.json' => sub {
604609
};
605610

606611
get '/list_host_devices/(:id_vm)' => sub($c) {
607-
$c->render(json => Ravada::WebSocket::_list_host_devices(undef,$RAVADA
612+
$c->render(json => Ravada::WebSocket::_list_host_devices($RAVADA
608613
, {
609614
channel => '/'.$c->stash('id_vm')
610615
,login => $USER->name

0 commit comments

Comments
 (0)