2.26.2 Added Log Session ID for Log Sessions Report

classaxe · Jan 4, 2021 · e05bf24 · e05bf24
1 parent 7d8dd75
commit e05bf24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/src/Columns/ListenerLogsessions.php b/src/Columns/ListenerLogsessions.php
@@ -13,17 +13,6 @@ class ListenerLogsessions
     public function getColumns()
     {
         return [
-//            'id' => [
-//                'admin'     =>  true,
-//                'arg'       =>  '',
-//                'field'     =>  'id',
-//                'label'     =>  'Session ID',
-//                'order'     =>  'a',
-//                'sort'      =>  'ls.id',
-//                'td_class'  =>  '',
-//                'th_class'  =>  '',
-//                'tooltip'   =>  '',
-//            ],
             'timestamp' => [
                 'admin'     =>  false,
                 'arg'       =>  '',

diff --git a/src/Columns/Logsessions.php b/src/Columns/Logsessions.php
@@ -13,17 +13,17 @@ class Logsessions
     public function getColumns()
     {
         return [
-//            'id' => [
-//                'admin'     =>  true,
-//                'arg'       =>  '',
-//                'field'     =>  'id',
-//                'label'     =>  'Session ID',
-//                'order'     =>  'a',
-//                'sort'      =>  'ls.id',
-//                'td_class'  =>  '',
-//                'th_class'  =>  '',
-//                'tooltip'   =>  '',
-//            ],
+            'id' => [
+                'admin'     =>  true,
+                'arg'       =>  '',
+                'field'     =>  'id',
+                'label'     =>  'Session ID',
+                'order'     =>  'a',
+                'sort'      =>  'ls.id',
+                'td_class'  =>  '',
+                'th_class'  =>  '',
+                'tooltip'   =>  '',
+            ],
             'uploader' => [
                 'admin'     =>  false,
                 'arg'       =>  '',

diff --git a/templates/log_sessions/grid.html.twig b/templates/log_sessions/grid.html.twig
@@ -37,7 +37,7 @@
                 %}>
         {%
             if key == 'id'
-        %}{% if isAdmin %}<a href="{{ url('log', { 'system' : system, 'id' : ls.id }) }}" data-popup="1">{{ ls.id }}</a>{% endif %}{%
+        %}{% if false %}<a href="{{ url('log', { 'system' : system, 'id' : ls.id }) }}" data-popup="1">{{ ls.id }}</a>{% else %}{{ ls.id }}{% endif %}{%
             elseif key == 'listener'
         %}<a href="{{ url('listener_logsessions', { 'system' : system, 'id' : ls.listenerId }) }}" data-popup="1" title="Click to view Log Sessions for this Listener">{{ ls.listener|raw }}</a>{%
             elseif key == 'delete' and isAdmin