Fix use common template for both user and user group permissions (#307)

This will: - title
ArmaForces · Jan 8, 2024 · 00dad38 · 00dad38
2 parents be576c7 + 176ec96
commit 00dad38
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 60 deletions.
diff --git a/templates/_partial/permissions/form.html.twig b/templates/_partial/permissions/form.html.twig
@@ -0,0 +1,59 @@
+<fieldset class="form-group">
+    <legend class="col-form-label">{{ title }}</legend>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'Users'|trans }}</legend>
+
+        {{ form_row(form.userList) }}
+        {{ form_row(form.userUpdate) }}
+        {{ form_row(form.userDelete) }}
+    </fieldset>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'User groups'|trans }}</legend>
+
+        {{ form_row(form.userGroupList) }}
+        {{ form_row(form.userGroupCreate) }}
+        {{ form_row(form.userGroupUpdate) }}
+        {{ form_row(form.userGroupDelete) }}
+    </fieldset>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'Mods'|trans }}</legend>
+
+        {{ form_row(form.modList) }}
+        {{ form_row(form.modCreate) }}
+        {{ form_row(form.modUpdate) }}
+        {{ form_row(form.modDelete) }}
+        {{ form_row(form.modChangeStatus) }}
+    </fieldset>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'Mod groups'|trans }}</legend>
+
+        {{ form_row(form.modGroupList) }}
+        {{ form_row(form.modGroupCreate) }}
+        {{ form_row(form.modGroupUpdate) }}
+        {{ form_row(form.modGroupDelete) }}
+    </fieldset>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'DLCs'|trans }}</legend>
+
+        {{ form_row(form.dlcList) }}
+        {{ form_row(form.dlcCreate) }}
+        {{ form_row(form.dlcUpdate) }}
+        {{ form_row(form.dlcDelete) }}
+    </fieldset>
+
+    <fieldset class="form-group">
+        <legend class="col-form-label">{{ 'Mod lists'|trans }}</legend>
+
+        {{ form_row(form.modListList) }}
+        {{ form_row(form.modListCreate) }}
+        {{ form_row(form.modListUpdate) }}
+        {{ form_row(form.modListCopy) }}
+        {{ form_row(form.modListDelete) }}
+        {{ form_row(form.modListApprove) }}
+    </fieldset>
+</fieldset>
diff --git a/templates/user/form.html.twig b/templates/user/form.html.twig
@@ -15,65 +15,7 @@
 
     {{ form_row(form.steamId) }}
 
-    <fieldset class="form-group">
-        <legend class="col-form-label">{{ 'User permissions'|trans }}</legend>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'Users'|trans }}</legend>
-
-            {{ form_row(form.permissions.userList) }}
-            {{ form_row(form.permissions.userUpdate) }}
-            {{ form_row(form.permissions.userDelete) }}
-        </fieldset>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'User groups'|trans }}</legend>
-
-            {{ form_row(form.permissions.userGroupList) }}
-            {{ form_row(form.permissions.userGroupCreate) }}
-            {{ form_row(form.permissions.userGroupUpdate) }}
-            {{ form_row(form.permissions.userGroupDelete) }}
-        </fieldset>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'Mods'|trans }}</legend>
-
-            {{ form_row(form.permissions.modList) }}
-            {{ form_row(form.permissions.modCreate) }}
-            {{ form_row(form.permissions.modUpdate) }}
-            {{ form_row(form.permissions.modDelete) }}
-            {{ form_row(form.permissions.modChangeStatus) }}
-        </fieldset>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'Mod groups'|trans }}</legend>
-
-            {{ form_row(form.permissions.modGroupList) }}
-            {{ form_row(form.permissions.modGroupCreate) }}
-            {{ form_row(form.permissions.modGroupUpdate) }}
-            {{ form_row(form.permissions.modGroupDelete) }}
-        </fieldset>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'DLCs'|trans }}</legend>
-
-            {{ form_row(form.permissions.dlcList) }}
-            {{ form_row(form.permissions.dlcCreate) }}
-            {{ form_row(form.permissions.dlcUpdate) }}
-            {{ form_row(form.permissions.dlcDelete) }}
-        </fieldset>
-
-        <fieldset class="form-group">
-            <legend class="col-form-label">{{ 'Mod lists'|trans }}</legend>
-
-            {{ form_row(form.permissions.modListList) }}
-            {{ form_row(form.permissions.modListCreate) }}
-            {{ form_row(form.permissions.modListUpdate) }}
-            {{ form_row(form.permissions.modListCopy) }}
-            {{ form_row(form.permissions.modListDelete) }}
-            {{ form_row(form.permissions.modListApprove) }}
-        </fieldset>
-    </fieldset>
+    {{ include ('_partial/permissions/form.html.twig', { form: form.permissions, title: 'User permissions'|trans }) }}
 
     {{- form_rest(form) -}}
 

diff --git a/templates/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig b/templates/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig
@@ -7,5 +7,5 @@
 </div>
 
 <div class="tab-pane fade{{ tabMacro.tab_show(active, 'permissions') }}" id="permissions" role="tabpanel">
-    {{ form_row(form.permissions) }}
+    {{ include ('_partial/permissions/form.html.twig', { form: form.permissions, title: 'User group permissions'|trans }) }}
 </div>