DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-07-05 17:58:59 -07:00
parent f1488767f8 ee4f355e49
commit 7a0c9776b4
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Auth/LoginController.php
View file

@ -116,7 +116,7 @@ class LoginController extends Controller
Auth::login($user); Auth::login($user);
} else { } else {
$username = $saml->getUsername(); $username = $saml->getUsername();
\Log::warning("SAML user '$username' could not be found in database."); \Log::debug("SAML user '$username' could not be found in database.");
$request->session()->flash('error', trans('auth/message.signin.error')); $request->session()->flash('error', trans('auth/message.signin.error'));
$saml->clearData(); $saml->clearData();
} }
@ -127,7 +127,7 @@ class LoginController extends Controller
} }
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::warning('There was an error authenticating the SAML user: '.$e->getMessage()); \Log::debug('There was an error authenticating the SAML user: '.$e->getMessage());
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
@ -138,7 +138,7 @@ class LoginController extends Controller
if (!$saml->isEnabled()) { if (!$saml->isEnabled()) {
\Log::debug("SAML page requested, but SAML does not seem to enabled."); \Log::debug("SAML page requested, but SAML does not seem to enabled.");
} else { } else {
\Log::warning("SAML page requested, but samlData seems empty."); \Log::debug("SAML page requested, but samlData seems empty.");
} }
} }

2
app/Listeners/LogListener.php
View file

@ -54,7 +54,7 @@ class LogListener
public function onCheckoutAccepted(CheckoutAccepted $event) public function onCheckoutAccepted(CheckoutAccepted $event)
{ {
\Log::error('event passed to the onCheckoutAccepted listener:'); \Log::debug('event passed to the onCheckoutAccepted listener:');
$logaction = new Actionlog(); $logaction = new Actionlog();
$logaction->item()->associate($event->acceptance->checkoutable); $logaction->item()->associate($event->acceptance->checkoutable);
$logaction->target()->associate($event->acceptance->assignedTo); $logaction->target()->associate($event->acceptance->assignedTo);

2
app/Providers/AppServiceProvider.php
View file

@ -40,7 +40,7 @@ class AppServiceProvider extends ServiceProvider
if (strpos(env('APP_URL'), 'https') === 0) { if (strpos(env('APP_URL'), 'https') === 0) {
$url->forceScheme('https'); $url->forceScheme('https');
} else { } else {
\Log::warning("'APP_FORCE_TLS' is set to true, but 'APP_URL' does not start with 'https://'. Will not force TLS on connections."); \Log::debug("'APP_FORCE_TLS' is set to true, but 'APP_URL' does not start with 'https://'. Will not force TLS on connections.");
} }
} }

9
resources/views/hardware/edit.blade.php
View file

@ -158,6 +158,13 @@
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
@if(Request::has('model_id'))
//TODO: Refactor custom fields to use Livewire, populate from server on page load when requested with model_id
$(document).ready(function() {
fetchCustomFields()
});
@endif
var transformed_oldvals={}; var transformed_oldvals={};
function fetchCustomFields() { function fetchCustomFields() {
@ -370,4 +377,4 @@
</script> </script>
@stop @stop