Skip to content

Commit 3374dd7

Browse files
committed
feat(frontend): auto view machine when started
issue UPC#812 angular version
1 parent 74b9904 commit 3374dd7

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

etc/rvd_front.conf.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
,guide_custom => ''
2424
,session_timeout => 5*60
2525
,session_timeout_admin => 15*60
26+
,auto_view => 0
2627
};

public/js/ravada.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@
358358
};
359359

360360
function run_domain_req_ctrl($scope, $http, $timeout, request ) {
361+
var redirected_display = false;
361362
$scope.get_domain_info = function() {
362363
if ($scope.id_domain) {
363364
var seconds = 1000;
@@ -371,6 +372,10 @@
371372
if ($scope.domain.is_active) {
372373
seconds = 5000;
373374
$scope.redirect();
375+
if ($scope.auto_view && !redirected_display && !$scope.domain.spice_password) {
376+
location.href='/machine/display/'+$scope.domain.id;
377+
redirected_display=true;
378+
}
374379
}
375380
$timeout(function() {
376381
$scope.get_domain_info();

rvd_front.pl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
,autostart => 0
6767
}
6868
,config => $FILE_CONFIG_RAVADA
69+
,auto_view => 0
6970
}
7071
,file => $FILE_CONFIG
7172
};
@@ -1217,7 +1218,9 @@ sub _new_domain_name {
12171218
}
12181219

12191220
sub run_request($c, $request) {
1220-
return $c->render(template => 'main/run_request', request => $request );
1221+
return $c->render(template => 'main/run_request', request => $request
1222+
, auto_view => ( $CONFIG_FRONT->{auto_view} or $c->session('auto_view') or 0)
1223+
);
12211224
}
12221225

12231226
sub _open_iptables {

templates/main/run_request.html.ep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
%= include 'bootstrap/navigation'
66
<div class="container theme-showcase" role="main"
77
ng-controller="run_domain_req"
8-
ng-init="id_request=<%= $request->id %>"
8+
ng-init="id_request=<%= $request->id %>;auto_view=<%= $auto_view %>"
99
>
1010
<div class="jumbotron">
1111

0 commit comments

Comments
 (0)