Merge pull request #2007 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/Admin/ExplorerController.php

@@ -5,7 +5,7 @@
         {{ trans('global.back_to_list') }}
     </a>
 
-    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=ACTIVITY_{{$activity->id}}">
+    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$activity->getUID()}}">
         {{ trans('global.explore') }}
     </a>
 

app/Http/Controllers/Admin/ExplorerController2.php

@@ -6,7 +6,7 @@
             {{ trans('global.back_to_list') }}
         </a>
 
-        <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=ACTOR_{{$actor->id}}">
+        <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$actor->getUID()}}">
             {{ trans('global.explore') }}
         </a>
 

composer.lock

@@ -5,7 +5,7 @@
         {{ trans('global.back_to_list') }}
     </a>
 
-    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=USER_{{$adminUser->id}}">
+    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$adminUser->getUID()}}">
         {{ trans('global.explore') }}
     </a>
 

resources/views/admin/activities/show.blade.php

@@ -5,7 +5,7 @@
         {{ trans('global.back_to_list') }}
     </a>
 
-    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=ANNUAIRE_{{$annuaire->id}}">
+    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$annuaire->getUID()}}">
         {{ trans('global.explore') }}
     </a>
 

resources/views/admin/actors/show.blade.php

@@ -1,11 +1,19 @@
+@props([
+    'applicationBlock',
+    'withLink' => false,
+])
 <table class="table table-bordered table-striped table-report" id="{{ $applicationBlock->getUID() }}">
     <tbody>
         <tr>
             <th width="10%">
                 {{ trans('cruds.applicationBlock.fields.name') }}
             </th>
             <td>
-                {{ $applicationBlock->name }}
+            @if($withLink)
+            <a href="{{ route('admin.application-blocks.show',$applicationBlock->id) }}">{{ $applicationBlock->name }}</a>
+            @else
+            {{ $applicationBlock->name }}
+            @endif
             </td>
         </tr>
         <tr>

resources/views/admin/adminUser/show.blade.php

@@ -5,7 +5,7 @@
         {{ trans('global.back_to_list') }}
     </a>
 
-    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=BLOCK_{{$applicationBlock->id}}">
+    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$applicationBlock->getUID()}}">
         {{ trans('global.explore') }}
     </a>
 

resources/views/admin/annuaires/show.blade.php

@@ -5,7 +5,7 @@
         {{ trans('global.back_to_list') }}
     </a>
 
-    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node=MOD_{{$applicationModule->id}}">
+    <a class="btn btn-success" href="{{ route('admin.report.explore') }}?node={{$applicationModule->getUID()}}">
         {{ trans('global.explore') }}
     </a>