Skip to content

Commit c99327e

Browse files
authored
Removed deprecated usage of Ibexa\Core\Repository\Values\User\User::$content property (#1575)
1 parent 866cff4 commit c99327e

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

src/bundle/Resources/views/themes/admin/account/profile/view.html.twig

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@
1616
} %}
1717
{% endblock %}
1818

19-
{% set content = user.content %}
20-
2119
{% block content %}
2220
<div class="ibexa-user-profile">
2321
<header class="ibexa-user-profile__header ibexa-container container">
2422
<div class="ibexa-user-profile-name">
25-
<h2>{{ ibexa_content_name(content) }}</h2>
23+
<h2>{{ ibexa_content_name(user) }}</h2>
2624
</div>
2725
<div class="ibexa-user-thumbnail-wrapper">
2826
{% include '@ibexadesign/ui/component/user_thumbnail/user_thumbnail.html.twig' with {
29-
user_content: content,
3027
user: user,
3128
attr_svg: { width: 220, height: 220 }
3229
} only %}
@@ -58,7 +55,7 @@
5855
{% set items = [
5956
{
6057
label: 'user_profile.summary.full_name.label'|trans|desc("Full name"),
61-
content: ibexa_content_name(content),
58+
content: ibexa_content_name(user),
6259
},
6360
{
6461
label: 'user_profile.summary.email.label'|trans|desc("Email"),
@@ -67,14 +64,14 @@
6764
] %}
6865

6966
{% for group in field_groups %}
70-
{% set field_definitions = content.getContentType().getFieldDefinitions().filterByGroup(group) %}
67+
{% set field_definitions = user.getContentType().getFieldDefinitions().filterByGroup(group) %}
7168

7269
{% for field_definition in field_definitions %}
7370
{% set field_identifier = field_definition.identifier %}
74-
{% set is_field_empty = ibexa_field_is_empty(content, field_identifier) %}
71+
{% set is_field_empty = ibexa_field_is_empty(user, field_identifier) %}
7572
{% set items = items|merge([{
76-
label: ibexa_field_name(content, field_identifier),
77-
content_raw: is_field_empty ? '' : ibexa_render_field(content, field_identifier),
73+
label: ibexa_field_name(user, field_identifier),
74+
content_raw: is_field_empty ? '' : ibexa_render_field(user, field_identifier),
7875
is_field_empty,
7976
}]) %}
8077
{% endfor %}

src/bundle/Resources/views/themes/admin/ui/component/user/user.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<div class="ibexa-user-name">
99
<span class="ibexa-user-name__thumbnail">
1010
{% include '@ibexadesign/ui/component/user_thumbnail/user_thumbnail.html.twig' with {
11-
user_content: user.content,
1211
user: user,
1312
attr_svg: {
1413
width: 20,

src/bundle/Resources/views/themes/admin/ui/component/user_thumbnail/user_thumbnail.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% import "@ibexadesign/ui/component/macros.html.twig" as html %}
22

3-
{% set user_image = user_content.thumbnail|default() %}
3+
{% set user_image = user.thumbnail|default() %}
44

55
{% if user_image.mimeType is defined and user_image.mimeType == 'image/svg+xml' %}
66
{% set attr_svg = attr_svg|default({})|merge({
@@ -17,7 +17,7 @@
1717
{% set attr_img = attr_img|default({})|merge({
1818
class: ('ibexa-user-thumbnail ibexa-user-thumbnail--img ' ~ attr_img.class|default(''))|trim,
1919
src: attr_img.src is defined ? attr_img.src : user_image.resource,
20-
alt: attr_img.alt is defined ? attr_img.alt : user_content.name,
20+
alt: attr_img.alt is defined ? attr_img.alt : user.name,
2121
}) %}
2222

2323
<img {{ html.attributes(attr_img|default({})) }}/>

src/bundle/Resources/views/themes/admin/ui/menu/user.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{% block root %}
44
{% set user = ibexa_admin_ui_config.user.user %}
5-
{% set user_image = user.content.thumbnail|default() %}
5+
{% set user_image = user.thumbnail|default() %}
66

77
<div class="ibexa-header-user-menu">
88
<div
@@ -19,7 +19,7 @@
1919
<button class="ibexa-header-user-menu__toggler">
2020
<div class="ibexa-header-user-menu__thumbnail-wrapper">
2121
{% include '@ibexadesign/ui/component/user_thumbnail/user_thumbnail.html.twig' with {
22-
user_content: user.content|default(),
22+
user: user,
2323
} %}
2424
</div>
2525
<svg class="ibexa-icon ibexa-icon--tiny">

src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
{{ form_errors(form.users) }}
3232

3333
{% set items = form.users.vars.data|map((user) => {
34-
id: user.content.versionInfo.contentInfo.id,
34+
id: user.versionInfo.contentInfo.id,
3535
name: ibexa_content_name(user)
3636
}) %}
3737
{% set items_map = form.users.vars.data|reduce((output, user) => output + {
38-
(user.id): user.content.versionInfo.contentInfo.mainLocationId,
38+
(user.id): user.contentInfo.mainLocationId,
3939
}, {}) %}
4040
{% set users_udw_title = "role_assignment.view.add.panel.users_and_groups.users.udw_title"
4141
|trans({}, 'ibexa_role')

0 commit comments

Comments
 (0)