Unverified Commit 237142ee authored by Francesc Guasch's avatar Francesc Guasch Committed by GitHub
Browse files

Fix/1119 timeout (#1120)

* wip(frontend): pass configured timeout when starting

issue #1119
parent ec40facc
......@@ -673,7 +673,7 @@
else {
window.location.href="/logout";
}
}, 60000);
}, $scope.timeout);
$scope.redirect_done = true;
}
}
......
......@@ -1605,9 +1605,12 @@ sub _new_domain_name {
}
sub run_request($c, $request, $anonymous = 0) {
my $timeout = $SESSION_TIMEOUT;
$timeout = $SESSION_TIMEOUT_ADMIN if $USER->is_admin;
return $c->render(template => 'main/run_request', request => $request
, auto_view => ( $CONFIG_FRONT->{auto_view} or $c->session('auto_view') or 0)
, anonymous => $anonymous
, timeout => $timeout * 1000
);
}
......
......@@ -8,7 +8,7 @@
%= include 'bootstrap/navigation'
<div class="container theme-showcase" role="main"
ng-controller="run_domain_req"
ng-init="id_request=<%= $request->id %>;auto_view=<%= $auto_view %>"
ng-init="id_request=<%= $request->id %>;auto_view=<%= $auto_view %>;timeout=<%= $timeout %>"
>
<div class="jumbotron">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment