Bug 1796452: Allow role options for group/user to display on edit

Even if the role selected was no specific role

behatnotneeded

Change-Id: I21718fe4880ad65e0b0205d6a2a5179fa3c1d001
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit c335ab77)

htdocs/theme/raw/templates/form/viewacl.tpl

@@ -83,9 +83,9 @@
                     {% if (o.presets.id) { %}<option value="{%=o.presets.id%}">{%=o.presets.name%}</option>{% } %}
                 </select>
             </div>
-            <span class="picker input-short{% if (!o.presets.role) { %} hidden{% } %}">
+            <span class="picker input-short{% if (!(o.presets.type == 'group' || o.presets.type == 'user')) { %} hidden {% } %}">
                 <select data-roles="grouproles" name="accesslist[{%=o.id%}][role]" class="form-control input-small select">
-                    {% if (o.presets.role) { %}
+                    {% if (o.presets.type == 'group' || o.presets.type == 'user') { %}
                         <option value="" >{%=o.defaultText%}</option>
                         {% for (var i=0; i<o.roles.length; i++) { %}
                              <option value="{%=o.roles[i].name%}" {% if (o.presets.role == o.roles[i].name) { %} selected {% } %}>{%=o.roles[i].display%}</option>