diff --git a/netbox/templates/users/panels/actions.html b/netbox/templates/users/panels/actions.html
index 4fa7c28b7..ffd7d2d95 100644
--- a/netbox/templates/users/panels/actions.html
+++ b/netbox/templates/users/panels/actions.html
@@ -16,7 +16,7 @@
{% checkmark enabled %}
{% if models %}
- {{ models }}
+ {{ models|join:", " }}
{% endif %}
diff --git a/netbox/users/models/permissions.py b/netbox/users/models/permissions.py
index 4e86ed374..74b8f589e 100644
--- a/netbox/users/models/permissions.py
+++ b/netbox/users/models/permissions.py
@@ -86,7 +86,7 @@ class ObjectPermission(CloningMixin, models.Model):
def get_registered_actions(self):
"""
- Return a list of (action_name, is_enabled, model_keys_csv) tuples for all
+ Return a list of (action_name, is_enabled, model_keys) tuples for all
registered actions, indicating which are enabled on this permission.
"""
enabled_actions = set(self.actions) - set(RESERVED_ACTIONS)
@@ -97,7 +97,7 @@ class ObjectPermission(CloningMixin, models.Model):
action_models.setdefault(action.name, []).append(model_key)
return [
- (name, name in enabled_actions, ', '.join(sorted(action_models[name])))
+ (name, name in enabled_actions, sorted(action_models[name]))
for name in sorted(action_models)
]
diff --git a/netbox/utilities/tests/test_permissions.py b/netbox/utilities/tests/test_permissions.py
index 1594e8758..34e8450b5 100644
--- a/netbox/utilities/tests/test_permissions.py
+++ b/netbox/utilities/tests/test_permissions.py
@@ -167,11 +167,11 @@ class ObjectPermissionFormTest(TestCase):
registered = permission.get_registered_actions()
self.assertEqual(len(registered), 1)
- action_name, is_enabled, models_csv = registered[0]
+ action_name, is_enabled, model_keys = registered[0]
self.assertEqual(action_name, 'render_config')
self.assertTrue(is_enabled)
- self.assertIn('dcim.device', models_csv)
- self.assertIn('virtualization.virtualmachine', models_csv)
+ self.assertIn('dcim.device', model_keys)
+ self.assertIn('virtualization.virtualmachine', model_keys)
permission.delete()