Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
237142ee
Unverified
Commit
237142ee
authored
Aug 13, 2019
by
Francesc Guasch
Committed by
GitHub
Aug 13, 2019
Browse files
Fix/1119 timeout (#1120)
* wip(frontend): pass configured timeout when starting issue #1119
parent
ec40facc
Changes
3
Hide whitespace changes
Inline
Side-by-side
public/js/ravada.js
View file @
237142ee
...
...
@@ -673,7 +673,7 @@
else
{
window
.
location
.
href
=
"
/logout
"
;
}
},
60000
);
},
$scope
.
timeout
);
$scope
.
redirect_done
=
true
;
}
}
...
...
rvd_front.pl
View file @
237142ee
...
...
@@ -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
);
}
...
...
templates/main/run_request.html.ep
View file @
237142ee
...
...
@@ -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"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment