Merge branch 'master' into aggregations

madbob · Nov 17, 2024 · b516afd · b516afd
2 parents 1cca506 + e4cc5b3
commit b516afd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/code/app/Http/Controllers/BackedController.php b/code/app/Http/Controllers/BackedController.php
@@ -3,10 +3,9 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-
-use Log;
+use Illuminate\Support\Facades\Log;
 
+use App\Http\Controllers\Controller;
 use App\Exceptions\AuthException;
 use App\Exceptions\IllegalArgumentException;
 
@@ -31,15 +30,15 @@ protected function easyExecute($func)
             return $func();
         }
         catch (AuthException $e) {
-			\Log::debug('Errore autorizzazione: ' . $e->getMessage() . "\n" . $e->getTraceAsString());
+			\Log::debug('Errore autorizzazione: ' . $e->getMessage());
             abort($e->status());
         }
         catch (IllegalArgumentException $e) {
 			\Log::debug('Errore input: ' . $e->getMessage() . "\n" . $e->getTraceAsString());
             return $this->errorResponse($e->getMessage(), $e->getArgument());
         }
         catch (\Exception $e) {
-            \Log::debug('Errore non identificato: ' . $e->getMessage() . "\n" . $e->getTraceAsString());
+			\Log::error('Errore non identificato: ' . $e->getMessage() . "\n" . $e->getTraceAsString());
             return $this->errorResponse(_i('Errore') . ': ' . $e->getMessage());
         }
     }

diff --git a/code/resources/views/app.blade.php b/code/resources/views/app.blade.php
@@ -76,6 +76,11 @@
             <p>
                 {{ _i('Attenzione: per problemi sui contenuti di questo sito (fornitori, ordini, prenotazioni...) fai riferimento agli amministrazioni del tuo GAS.') }}
             </p>
+			<ul>
+				@foreach(everybodyCan('gas.permissions', $currentgas) as $admin)
+					<li>{{ $admin->printableName() }} - {{ join(', ', $admin->getContactsByType('email')) }}</li>
+				@endforeach
+			</ul>
 
             @if(currentLang() != 'it_IT')
                 <p>