From 3560bd1769cf61decc2a3c719a7b193be19f70e7 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Thu, 2 May 2019 11:25:55 +0200
Subject: [PATCH] correctifs

---
 .../CoreBundle/Controller/GroupController.php     | 15 ++++++++++-----
 .../Resources/views/Group/list.html.twig          |  3 ++-
 .../Resources/views/Blogarticle/edit.html.twig    |  6 +-----
 .../Resources/views/Pagewidget/viewflux.html.twig |  5 +++--
 .../Resources/views/Pagewidget/viewitem.html.twig |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
index cd741c7a..34b216b3 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@@ -92,12 +92,16 @@ class GroupController extends Controller
 
         foreach($datas as $data) {
             $action = "";
-            //if(!$data->getFgall()&&!$data->getFgTemplate()) 
-            $action .="<a href='".$this->generateUrl('cadoles_core_config_group_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-fw'></i></a>";
-            if($data->getId()>0&&!$data->getFgall()&&!$data->getFgTemplate()&&$this->isGranted('ROLE_ADMIN')) $action.="<a href='".$this->generateUrl('cadoles_core_config_group_delete', array('id'=>$data->getId()))."'><i class='fa fa-trash fa-fw'></i></a>";
-            if(!$data->getFgall()) $action .="<a href='".$this->generateUrl('cadoles_core_config_group_users', array('id'=>$data->getId()))."'><i class='fa fa-users fa-fw'></i></a>";
 
-            array_push($output["data"],array($action,$data->getLabel(),($data->getFgopen()?"oui":"non"),($data->getFgcanshare()?"oui":"non")));
+            $action .="<a href='".$this->generateUrl('cadoles_core_config_group_update', array('id'=>$data->getId()))."'><i class='fa fa-file fa-2x fa-fw'></i></a>";
+            if($data->getId()>0&&!$data->getFgall()&&!$data->getFgTemplate()&&$this->isGranted('ROLE_ADMIN')) $action.="<a href='".$this->generateUrl('cadoles_core_config_group_delete', array('id'=>$data->getId()))."'><i class='fa fa-trash fa-fw fa-2x'></i></a>";
+            if(!$data->getFgall()) $action .="<a href='".$this->generateUrl('cadoles_core_config_group_users', array('id'=>$data->getId()))."'><i class='fa fa-users fa-2x fa-fw'></i></a>";
+
+            $filtre="";
+            if($this->GetParameter("masteridentity")=="LDAP") $filtre=$data->getLdapfilter();
+            if($this->GetParameter("masteridentity")=="SSO") $filtre=$data->getAttributes();
+
+            array_push($output["data"],array($action,$data->getLabel(),($data->getFgopen()?"oui":"non"),($data->getFgcanshare()?"oui":"non"),$filtre));
         }
 
         // Retour
@@ -417,6 +421,7 @@ class GroupController extends Controller
     {
         // Initialisation de l'enregistrement
         $data = new Group();
+        $data->setFgopen(false);
         
         // Création du formulaire
         $form = $this->createForm(GroupType::class,$data,array("mode"=>"submit","updatelimite"=>false,"masteridentity"=> $this->GetParameter("masteridentity")));
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
index 9487226c..6f15fec8 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
@@ -15,10 +15,11 @@
                 <table class="table table-striped table-bordered table-hover" id="dataTables" style="width:100%">
                     <thead>
                     <tr>
-                        <th width="70px" class="no-sort">Action</th>
+                        <th width="130px" class="no-sort">Action</th>
                         <th>Label</th>
                         <th>Ouvert</th>
                         <th>Partage</th>
+                        <th class="no-sort">Filtre</th>
                     </tr>
                     </thead>
                 </table>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blogarticle/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blogarticle/edit.html.twig
index b351ed12..b06377d9 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blogarticle/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blogarticle/edit.html.twig
@@ -56,6 +56,7 @@
         <div class="col-md-8">
             {{ form_row(form.name) }}
             {{ form_row(form.blog) }}
+             {{ form_row(form.description) }}
         </div>
         
         <div class="col-md-4">
@@ -65,11 +66,6 @@
             {{ form_widget(form.image) }}
             </div>     
         </div>
-
-        <div class="col-md-12">
-            {{ form_row(form.description) }}
-        </div>
-
     </div>
 
   
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
index 90ac557e..b73f5214 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
@@ -44,8 +44,9 @@
                 {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %}
             {% endif %}
 
-
-            <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }}">{{ flux.title }}</div>
+             {% if fluxs|length > 1 %}
+                <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }}">{{ flux.title }}</div>
+            {% endif %}
         {% endfor %}
 
         {% for feed in feeds %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
index 27b79476..f4cfe70a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig
@@ -117,7 +117,7 @@
                 {% if loop.index ==1 %}
                 {% set haveitem=true %}
 
-                {% if mycategs|length > 1 %}
+                {% if mycategs|length > 1 or bookmarks is not empty %}
                     <h3 class="grid-title" style="{{ colorbodyfont }}" data-idcategory="{{ itemcategory.id }}">{{ itemcategory.label }}</h3>
                 {% else %}
                     <p></p>