Skip to content

Commit 36a945c

Browse files
committed
Changed view. Added translations.
1 parent efd9a09 commit 36a945c

File tree

3 files changed

+45
-21
lines changed

3 files changed

+45
-21
lines changed

Diff for: Resources/translations/messages.en.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
glavweb_security:
2+
header_permissions_entities: Permissions for entities
3+
header_basic_roles: Basic roles
4+
role:
5+
create: Create
6+
list: List
7+
view: View
8+
edit: Edit
9+
delete: Delete
10+
export: Export
11+
role_group:
12+
master: Master

Diff for: Resources/translations/messages.ru.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
glavweb_security:
2+
header_permissions_entities: Права доступа к объектам
3+
header_basic_roles: Базовые роли
4+
role:
5+
create: Создание
6+
list: Список
7+
view: Просмотр
8+
edit: Изменение
9+
delete: Удаление
10+
export: Экспорт
11+
role_group:
12+
master: Все записи

Diff for: Resources/views/Form/fields.html.twig

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,44 @@
22

33
{% block glavweb_security_roles_widget %}
44
{% spaceless %}
5-
<div class="editable">
5+
<div class="glavweb-security-field-wrapper">
66
{% set values = {} %}
77
{%- for name, child in form %}
88
{%- set values = values|merge({(child.vars.label) : (name)}) %}
99
{% endfor -%}
1010

11+
<h4 class="glavweb-security-header-basic-roles">{% trans %}glavweb_security.header_basic_roles{% endtrans %}</h4>
12+
{% for name, value in securityRoles %}
13+
{% set child = form[values[name]] %}
14+
15+
<div>
16+
{{- form_widget(child, {'label': value}) -}}
17+
</div>
18+
{% endfor %}
19+
1120
{% if entityRoles|length %}
12-
<h4>Permissions for entities</h4>
21+
<h4 class="glavweb-security-header-permissions-entities">{% trans %}glavweb_security.header_permissions_entities{% endtrans %}</h4>
1322
<table class="table">
1423
<tr>
1524
<td></td>
16-
<td>Create</td>
17-
<td>List</td>
18-
<td>View</td>
19-
<td>Edit</td>
20-
<td>Delete</td>
21-
<td>Export</td>
25+
<td>{% trans %}glavweb_security.role.create{% endtrans %}</td>
26+
<td>{% trans %}glavweb_security.role.list{% endtrans %}</td>
27+
<td>{% trans %}glavweb_security.role.view{% endtrans %}</td>
28+
<td>{% trans %}glavweb_security.role.edit{% endtrans %}</td>
29+
<td>{% trans %}glavweb_security.role.delete{% endtrans %}</td>
30+
<td>{% trans %}glavweb_security.role.export{% endtrans %}</td>
2231
</tr>
2332

2433
{% for entityName, roleChoices in entityRoles %}
2534
<tr><td colspan="7"><strong>{{ entityName }}</strong></td></tr>
2635

2736
{% for roleName, roleData in roleChoices %}
28-
{% set roleName = roleData['name'] %}
29-
{% set choices = roleData['roles'] %}
37+
{% set roleName = roleData['name'] %}
38+
{% set choices = roleData['roles'] %}
39+
{% set roleGroupName = 'glavweb_security.role_group.' ~ roleName|lower %}
3040

3141
<tr>
32-
<td>&nbsp;&nbsp;&nbsp;&nbsp;{{ roleName }}</td>
42+
<td>&nbsp;&nbsp;&nbsp;&nbsp;{{ roleGroupName|trans }}</td>
3343
{% if roleName != 'Master' %}
3444
<td></td>
3545
<td></td>
@@ -48,16 +58,6 @@
4858
</table>
4959
{% endif %}
5060

51-
<h4>Basic roles</h4>
52-
{% for name, value in securityRoles %}
53-
{% set child = form[values[name]] %}
54-
55-
<div>
56-
{{- form_widget(child) -}}
57-
{{- form_label(child, null, {translation_domain: choice_translation_domain}) -}}
58-
</div>
59-
{% endfor %}
60-
6161
</div>
6262
{% endspaceless %}
6363
{% endblock %}

0 commit comments

Comments
 (0)