Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

resolv conflict

This commit is contained in:
Arnaud Fornerot 2020-07-10 12:23:07 +02:00
parent 2392318922 39c469fd45
commit 4ae4dabb9f
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
View File

@ -6,7 +6,7 @@
{% if mode=="datauser" %}
Paramétrage de la Fiche Utilisateur
{% else %}
Paramétrage de la Listes des Utilisateurs
Paramétrage de la Liste des Utilisateurs
{% endif %}
</h1>

2
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
View File

@ -33,7 +33,7 @@ td { font-size: 10px; }
<th class="no-sort">Action</th>
{% endif %}
<th class="no-sort {% if fields["avatar"] is defined and fields["avatar"].perm==0 %}no-visible{% endif %}">Avatar</th>
<th class=="{% if fields["login"] is defined and fields["login"].perm==0 %}no-visible{% endif %}">Login</th>
<th class="{% if fields["login"] is defined and fields["login"].perm==0 and access!="config"%}no-visible{% endif %}">Login</th>
<th class="{% if fields["lastname"] is defined and fields["lastname"].perm==0 %}no-visible{% endif %}">Nom</th>
<th class="{% if fields["firstname"] is defined and fields["firstname"].perm==0 %}no-visible{% endif %}">Prénom</th>
<th class="{% if fields["email"] is defined and fields["email"].perm==0 %}no-visible{% endif %}">Email</th>

15
src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
View File

@ -523,9 +523,14 @@ class PagewidgetController extends Controller
}
$itemsroles=$qb->getQuery()->getResult();
foreach($itemsroles as $itemrole) {
if($withbookmark==1) {
if(!$items->contains($itemrole)) $items->add($itemrole);
}
else {
if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
}
}
}
// Récupération des items par group
foreach($groups as $group) {
@ -541,9 +546,14 @@ class PagewidgetController extends Controller
}
$itemsgroups=$qb->getQuery()->getResult();
foreach($itemsgroups as $itemgroup) {
if($withbookmark==1) {
if(!$items->contains($itemgroup)) $items->add($itemgroup);
}
else {
if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
}
}
}
// Récupération des items par niveau01
if($niveau01) {
@ -559,9 +569,14 @@ class PagewidgetController extends Controller
}
$itemsniveau01s=$qb->getQuery()->getResult();
foreach($itemsniveau01s as $itemniveau01) {
if($withbookmark==1) {
if(!$items->contains($itemniveau01)) $items->add($itemniveau01);
}
else {
if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
}
}
}
// Trie des items
$itemsordered = $items->getIterator();