Merge branch 'master' into dist/envole/6/master

2020-10-01 16:35:39 +02:00 · 2020-10-01 16:35:39 +02:00 · d32ded9f5e
parent b1d9c2dc63 1ab804ee9b
commit d32ded9f5e
1 changed files with 5 additions and 1 deletions
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php
@ -133,10 +133,14 @@ class PageController extends Controller
                $user.=$data->getUser()->getUsername();
            }

+            $icon="";
+            if($data->getFonticon())
+                $icon.="<i class='".$data->getFonticon()." fa-fw'></i>&nbsp;";
+
            array_push($output["data"],[
                $action,
                $data->getRoworder(),
-                $data->getName(),
+                $icon.$data->getName(),
                $data->getPagecategory()->getName(),
                $user
            ]);