Merge branch 'main' into 'fix/guardas_sin_impresion'

Main

See merge request jjimenez/safekat!538
This commit is contained in:
2025-02-10 17:53:03 +00:00
2 changed files with 8 additions and 3 deletions

View File

@ -440,8 +440,14 @@ class Auth extends ShieldAuth
public function loginRedirect(): string
{
$session = session();
$url = $session->getTempdata('beforeLoginUrl') ?? setting('Auth.redirects')['login'];
$url = setting('Auth.redirects')['login'];
if(isset($_SERVER['HTTP_X_REQUESTED_WITH'])){
if($_SERVER['HTTP_X_REQUESTED_WITH'] == "xmlhttprequest"){
$url = setting('Auth.redirects')['login'];
}
}else{
$url = $session->getTempdata('beforeLoginUrl') ?? setting('Auth.redirects')['login'];
}
return $this->getUrl($url);
}

View File

@ -11,6 +11,5 @@ $(() => {
})
$("#btn-log-out").on("click",() => {
clearInterval(chatNotificationInterval)
console.log("CLEAR")
})
})