From 740b0ac1a5383456e1efef0f073576318d214fbb Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 12 May 2017 18:24:58 -0400
Subject: Fix wrong dropdown menu in group members list

---
 app/Template/group/user_dropdown.php | 11 +++++++++++
 app/Template/group/users.php         | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 app/Template/group/user_dropdown.php

(limited to 'app/Template')

diff --git a/app/Template/group/user_dropdown.php b/app/Template/group/user_dropdown.php
new file mode 100644
index 00000000..48acb955
--- /dev/null
+++ b/app/Template/group/user_dropdown.php
@@ -0,0 +1,11 @@
+<div class="dropdown">
+    <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong>#<?= $user['id'] ?> <i class="fa fa-caret-down"></i></strong></a>
+    <ul>
+        <li>
+            <?= $this->url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+        </li>
+        <li>
+            <?= $this->modal->medium('trash', t('Remove user from group'), 'GroupListController', 'dissociate', array('group_id' => $user['group_id'], 'user_id' => $user['id'])) ?>
+        </li>
+    </ul>
+</div>
diff --git a/app/Template/group/users.php b/app/Template/group/users.php
index 5025ca7a..2469296a 100644
--- a/app/Template/group/users.php
+++ b/app/Template/group/users.php
@@ -13,9 +13,20 @@
             <?= $this->render('user_list/header', array('paginator' => $paginator)) ?>
             <?php foreach ($paginator->getCollection() as $user): ?>
                 <div class="table-list-row table-border-left">
-                    <?= $this->render('user_list/user_title', array(
-                        'user' => $user,
-                    )) ?>
+                    <div>
+                        <?= $this->render('group/user_dropdown', array('user' => $user)) ?>
+                        <span class="table-list-title <?= $user['is_active'] == 0 ? 'status-closed' : '' ?>">
+                            <?= $this->avatar->small(
+                                $user['id'],
+                                $user['username'],
+                                $user['name'],
+                                $user['email'],
+                                $user['avatar_path'],
+                                'avatar-inline'
+                            ) ?>
+                            <?= $this->url->link($this->text->e($user['name'] ?: $user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
+                        </span>
+                    </div>
 
                     <?= $this->render('user_list/user_details', array(
                         'user' => $user,
-- 
cgit v1.2.3