diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig index 8504a88dd..cb6c3be40 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig @@ -1 +1 @@ -{{ user_group.label|localize_translatable_string }} +{{ user_group.label|localize_translatable_string }} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss index 072f13949..407a17f6d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss @@ -3,8 +3,11 @@ */ span.badge-user, +span.badge-user-group, span.badge-person, span.badge-thirdparty { + margin-top: 0.2rem; + margin-bottom: 0.2rem; display: inline-block; padding: 0 0.5em !important; background-color: $white; @@ -18,6 +21,10 @@ span.badge-thirdparty { } } +span.badge-user-group { + font-weight: 600; +} + span.badge-user { border-bottom-width: 1px; &.system { diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts index 430c7b320..2e1c53d42 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts @@ -47,10 +47,11 @@ export const moduleTicket: Module = { if (!result[datetime]) { result[datetime] = []; } - + /* if (item.event_type === "add_addressee") { result[datetime].push(item); } + */ return result; }, {} as any diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig index 6d25c5834..b4e58ca00 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig +++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig @@ -66,9 +66,11 @@
{% for d in ticket.currentAddressee %} {% if d.isUser is defined and d.isUser %} - {{ d|chill_entity_render_box }} + + {{ d|chill_entity_render_box }} + {% elseif d.isUserGroup is defined and d.isUserGroup %} - {{ d|chill_entity_render_box }} + {{ d|chill_entity_render_box() }} {% endif %} {% endfor %}