Merge branch 'allow-null-group-assignment' into issue-userfrosting#867

amosfolz · Jul 11, 2019 · 3467690 · 3467690
2 parents b49c11b + ce4c507
commit 3467690
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/sprinkles/admin/templates/pages/user.html.twig b/app/sprinkles/admin/templates/pages/user.html.twig
@@ -94,7 +94,7 @@
                                     <i class="fa fa-fw fa-bolt fa-lg text-yellow" title="{{translate('UNACTIVATED')}}"></i>
                                 {% endif %}
                             </div>
-                            <h4 class="text-muted text-center">{{user.user_name}}{% if 'group' not in fields.hidden %} • {{user.group.name}}{% endif %}</h4>
+                            <h4 class="text-muted text-center">{{user.user_name}}{% if 'group' not in fields.hidden and user.group.name is not null %} • {{user.group.name}}{% endif %}</h4>
 
                             {% if 'email' not in fields.hidden %}
                                 <hr>