Skip to content

Commit 8913bf4

Browse files
modelrailroaderthorsten
modelrailroader
authored and
thorsten
committed
fix: re-added restricted groups for medium-level (#2791)
1 parent 299d330 commit 8913bf4

File tree

2 files changed

+73
-39
lines changed

2 files changed

+73
-39
lines changed

‎phpmyfaq/admin/category.add.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@
6565
'ad_entry_all_users' => Translation::get('ad_entry_all_users'),
6666
'ad_entry_restricted_users' => Translation::get('ad_entry_restricted_users'),
6767
'ad_entry_userpermission' => Translation::get('ad_entry_userpermission'),
68-
'ad_categ_add' => Translation::get('ad_categ_add')
68+
'ad_categ_add' => Translation::get('ad_categ_add'),
69+
'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'),
70+
'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'),
71+
'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),
72+
'restricted_groups' => $currentUser->perm->getAllGroupsOptions([], $user)
6973
];
7074

7175
if ($parentId > 0) {

‎phpmyfaq/assets/templates/admin/content/category.add.twig‎

Lines changed: 68 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@
1313

1414
<div class="row mb-2">
1515
<div class="col-lg-12">
16-
<form enctype="multipart/form-data" action="?action=savecategory" method="post">
16+
<form enctype="multipart/form-data" action="?action=savecategory" method="post">
1717
<input type="hidden" id="lang" name="lang" value="{{ faqLangCode }}">
1818
<input type="hidden" name="parent_id" value="{{ parentId }}">
1919
{{ csrfTokenInput|raw }}
2020
{% if parentId > 0 %}
21-
<input type="hidden" name="restricted_users" value="{{ userAllowed }}">
22-
{% for group in groupsAllowed %}
23-
<input type="hidden" name="restricted_groups[]" value="{{ group }}">
24-
{% endfor %}
25-
<div class="row mb-2"><label class="col-lg-2 col-form-label">{{ msgMainCategory }}:</label>
26-
<div class="col-lg-4">
27-
<input type="text" readonly class="form-control-plaintext" id="staticEmail" value="{{ categoryName }} ({{ categoryNameLangCode }})">
21+
<input type="hidden" name="restricted_users" value="{{ userAllowed }}">
22+
{% for group in groupsAllowed %}
23+
<input type="hidden" name="restricted_groups[]" value="{{ group }}">
24+
{% endfor %}
25+
<div class="row mb-2"><label class="col-lg-2 col-form-label">{{ msgMainCategory }}:</label>
26+
<div class="col-lg-4">
27+
<input type="text" readonly class="form-control-plaintext" id="staticEmail"
28+
value="{{ categoryName }} ({{ categoryNameLangCode }})">
29+
</div>
2830
</div>
29-
</div>
3031
{% endif %}
3132
<div class="row mb-2">
3233
<label class="col-lg-2 col-form-label" for="name">
@@ -88,43 +89,72 @@
8889
</select>
8990
</div>
9091
</div>
91-
{% if parentId == 0 %}
9292
{% if permLevel != 'basic' %}
93-
<div class="row mb-2">
94-
<label class="col-lg-2 col-form-label" for="group_id">
95-
{{ ad_categ_moderator }}</label>
96-
<div class="col-lg-4">
97-
<select name="group_id" id="group_id" class="form-select">
98-
{{ groupsOptions|raw }}
99-
</select>
93+
<div class="row mb-2">
94+
<label class="col-lg-2 col-form-label" for="group_id">
95+
{{ ad_categ_moderator }}</label>
96+
<div class="col-lg-4">
97+
<select name="group_id" id="group_id" class="form-select">
98+
{{ groupsOptions|raw }}
99+
</select>
100+
</div>
100101
</div>
101-
</div>
102102
{% else %}
103-
<input type="hidden" name="group_id" value="-1">
103+
<input type="hidden" name="group_id" value="-1">
104104
{% endif %}
105-
<div class="row mb-2">
106-
<label class="col-lg-2 col-form-label" for="restricted_users">
107-
{{ ad_entry_userpermission }}
108-
</label>
109-
<div class="col-lg-4">
110-
<div class="form-check">
111-
<input type="radio" name="userpermission" id="userpermission_all" value="all"
112-
class="form-check-input" checked>
113-
<label class="form-check-label" for="userpermission_all">
114-
{{ ad_entry_all_users }}
105+
{% if parentId == 0 %}
106+
{% if permLevel != 'basic' %}
107+
<div class="row mb-2">
108+
<label class="col-lg-2 col-form-label" for="restricted_groups">
109+
{{ ad_entry_grouppermission }}
115110
</label>
111+
<div class="col-lg-4">
112+
<div class="form-check">
113+
<input type="radio" name="grouppermission" id="grouppermission_all" value="all"
114+
class="form-check-input" checked>
115+
<label class="form-check-label" for="grouppermission_all">
116+
{{ ad_entry_all_groups }}
117+
</label>
118+
</div>
119+
<div class="form-check">
120+
<input type="radio" name="grouppermission" id="grouppermission" value="restricted"
121+
class="form-check-input">
122+
<label class="form-check-label" for="grouppermission">
123+
{{ ad_entry_restricted_groups }}
124+
</label>
125+
</div>
126+
<select name="restricted_groups[]" id="restricted_groups" size="3" class="form-select"
127+
multiple>
128+
{{ restricted_groups|raw }}
129+
</select>
130+
</div>
116131
</div>
117-
<div class="form-check">
118-
<input type="radio" name="userpermission" id="userpermission" value="restricted" class="form-check-input">
119-
<label class="form-check-label" for="userpermission">
120-
{{ ad_entry_restricted_users }}
121-
</label>
132+
{% else %}
133+
<input type="hidden" name="grouppermission" value="all">
134+
{% endif %}
135+
<div class="row mb-2">
136+
<label class="col-lg-2 col-form-label" for="restricted_users">
137+
{{ ad_entry_userpermission }}
138+
</label>
139+
<div class="col-lg-4">
140+
<div class="form-check">
141+
<input type="radio" name="userpermission" id="userpermission_all" value="all"
142+
class="form-check-input" checked>
143+
<label class="form-check-label" for="userpermission_all">
144+
{{ ad_entry_all_users }}
145+
</label>
146+
</div>
147+
<div class="form-check">
148+
<input type="radio" name="userpermission" id="userpermission" value="restricted" class="form-check-input">
149+
<label class="form-check-label" for="userpermission">
150+
{{ ad_entry_restricted_users }}
151+
</label>
152+
</div>
153+
<select name="restricted_users" id="restricted_users" class="form-select">
154+
{{ userOptions|raw }}
155+
</select>
122156
</div>
123-
<select name="restricted_users" id="restricted_users" class="form-select">
124-
{{ userOptions|raw }}
125-
</select>
126157
</div>
127-
</div>
128158
{% endif %}
129159
<div class="row mb-2">
130160
<div class="offset-lg-2 col-lg-4">

0 commit comments

Comments
 (0)