From 29f352cf391f266e7d9cccaccb5e7ed4039864dc Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 1 Apr 2021 12:25:47 -0700
Subject: [PATCH] Fixed issue from merge conflict

---
 View/Elements/Components/groupattributes.ctp | 44 ++++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
index 67019c8..2c0ff8b 100644
--- a/View/Elements/Components/groupattributes.ctp
+++ b/View/Elements/Components/groupattributes.ctp
@@ -1,29 +1,27 @@
-<?php if (count($attr) > 0) : ?>
-    <table class="table table-striped w-100">
-        <thead>
+<table class="table table-striped w-100">
+    <thead>
+        <tr>
+            <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
+            <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
+            <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php foreach ($attributes as $attr) : ?>
             <tr>
-                <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
-                <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
-                <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+                <td><?php echo $attr['attributeDefNameName']; ?></td>
+                <td><?php echo $attr['attributeDefName'] ?></td>
+                <td>
+                    <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
+                        <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
+                    </a>
+                </td>
             </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($attributes as $attr) : ?>
-                <tr>
-                    <td><?php echo $attr['attributeDefNameName']; ?></td>
-                    <td><?php echo $attr['attributeDefName'] ?></td>
-                    <td>
-                        <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                            <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
-                        </a>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-<?php endif; ?>
+        <?php endforeach; ?>
+    </tbody>
+</table>
 <?php if (count($attributes) < 1) : ?>
     <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.group.info.attributes-zero-state'); ?></p>
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
     </div>
 <?php endif; ?>
\ No newline at end of file