feat(frontend): auto view machine when started

issue #812 angular version
UPC · Jul 16, 2018 · 3374dd7 · 3374dd7
1 parent 74b9904
commit 3374dd7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/etc/rvd_front.conf.example b/etc/rvd_front.conf.example
@@ -23,4 +23,5 @@
   ,guide_custom => ''
   ,session_timeout => 5*60
   ,session_timeout_admin => 15*60
+  ,auto_view => 0
 };
diff --git a/public/js/ravada.js b/public/js/ravada.js
@@ -358,6 +358,7 @@
     };
 
     function run_domain_req_ctrl($scope, $http, $timeout, request ) {
+        var redirected_display = false;
         $scope.get_domain_info = function() {
             if ($scope.id_domain) {
                 var seconds = 1000;
@@ -371,6 +372,10 @@
                     if ($scope.domain.is_active) {
                         seconds = 5000;
                         $scope.redirect();
+                        if ($scope.auto_view && !redirected_display && !$scope.domain.spice_password) {
+                            location.href='/machine/display/'+$scope.domain.id;
+                            redirected_display=true;
+                        }
                     }
                     $timeout(function() {
                         $scope.get_domain_info();

diff --git a/rvd_front.pl b/rvd_front.pl
@@ -66,6 +66,7 @@
                                                     ,autostart => 0
                                               }
                                               ,config => $FILE_CONFIG_RAVADA
+                                              ,auto_view => 0
                                               }
                                       ,file => $FILE_CONFIG
 };
@@ -1217,7 +1218,9 @@ sub _new_domain_name {
 }
 
 sub run_request($c, $request) {
-    return $c->render(template => 'main/run_request', request => $request );
+    return $c->render(template => 'main/run_request', request => $request
+        , auto_view => ( $CONFIG_FRONT->{auto_view} or $c->session('auto_view') or 0)
+    );
 }
 
 sub _open_iptables {

diff --git a/templates/main/run_request.html.ep b/templates/main/run_request.html.ep
@@ -5,7 +5,7 @@
     %= include 'bootstrap/navigation'
     <div class="container theme-showcase" role="main"
         ng-controller="run_domain_req"
-                ng-init="id_request=<%= $request->id %>"
+        ng-init="id_request=<%= $request->id %>;auto_view=<%= $auto_view %>"
     >
     <div class="jumbotron">