diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
index 6f0279aa21..52c83931e2 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php
@@ -764,17 +764,6 @@ class Push implements ControllerProviderInterface
$query->havePositions($request->get('Position'));
}
- if($request->get('ListUser'))
- {
- $entries = $list->getEntries();
- $ids = array();
- foreach($entries as $usrEntries)
- {
- $ids[] = $usrEntries->getUsrId();
- }
- $query->in($ids);
- }
-
$sort = $request->get('srt', 'usr_creationdate');
$ord = $request->get('ord', 'desc');
diff --git a/templates/web/prod/actions/Feedback/ListsMacros.html.twig b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
index c51710fce4..3b7bb3fe20 100644
--- a/templates/web/prod/actions/Feedback/ListsMacros.html.twig
+++ b/templates/web/prod/actions/Feedback/ListsMacros.html.twig
@@ -176,14 +176,20 @@
{% endmacro %}
-{% macro badgeReadonly(entry) %}
+{% macro badgeReadonly(entry, role) %}
+
+ {% if role >= constant('\\Entities\\UsrListOwner::ROLE_EDITOR') %}
+
+
+
+ {% endif %}
-
+ |
|
-
+ |
{{ entry.getUser().get_display_name() }}
|
diff --git a/templates/web/prod/actions/Feedback/list.html.twig b/templates/web/prod/actions/Feedback/list.html.twig
index 7c345cfff8..edfbb19b34 100644
--- a/templates/web/prod/actions/Feedback/list.html.twig
+++ b/templates/web/prod/actions/Feedback/list.html.twig
@@ -50,8 +50,9 @@
+ {% set role = list.getOwner(user).getRole() %}
{% for entry in list.getEntries() %}
- {{ ListsMacros.badgeReadonly(entry) }}
+ {{ ListsMacros.badgeReadonly(entry, role) }}
{% endfor %}
@@ -89,13 +90,7 @@
{% trans 'boutton::chercher' %}
-
-
+
@@ -178,5 +173,12 @@
diff --git a/www/skins/prod/Push.css b/www/skins/prod/Push.css
index f7637da16b..2b4f2073d4 100644
--- a/www/skins/prod/Push.css
+++ b/www/skins/prod/Push.css
@@ -213,7 +213,24 @@
width:250px;
display:inline-block;
margin:5px;
+ background-color: #515150;
+ padding:5px;
}
+
+#ListManager .content.readonly .badge .deleter{
+ float:right;
+}
+
+
+#ListManager .content.readonly .badge table{
+ width:auto;
+ table-layout: fixed;
+}
+
+#ListManager .content.readonly .badge .infos{
+ padding:2px;
+}
+
#ListManager h1 span.title{
font-size:24px;
line-height:24px;
|