Skip to content

Commit

Permalink
BAP-17600: Incorrect labels in data audit grid (#19829)
Browse files Browse the repository at this point in the history
  • Loading branch information
x86demon authored and OlegMufel committed Sep 14, 2018
1 parent e22bfe8 commit d3ccdec
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
{% macro renderFieldName(objectClass, fieldKey, fieldValue) %}
{% set fieldLabel = oro_field_config_value(objectClass, fieldKey, 'label')|default(fieldKey) %}
{% if fieldValue.translationDomain is defined %}
{% set fieldLabel = fieldKey|trans({}, fieldValue.translationDomain) %}
{% set fieldLabel = fieldLabel|trans({}, fieldValue.translationDomain) %}
{% else %}
{% set fieldLabel = fieldKey|trans %}
{% set fieldLabel = fieldLabel|trans %}
{% endif %}
{{- fieldLabel -}}:
{% endmacro %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@ticket-BAP-17600
@fixture-OroUserBundle:user.yml
Feature: DataAudit labels are translated
In order to get information about changed entity fields
As a Admin user
I need to be able to see entity labels translated in data audit grid

Scenario:
Given I login as administrator
And I go to System/User Management/Users
And I click "Edit" on row "Charlie" in grid
And I fill form with:
| Username | charlie-up |
| First Name | FNUP |
| Last Name | LNUP |
| Primary Email | email-up@test.com |
And save and close form
When I go to System/ Data Audit
Then I should see "Username:" in grid
And I should see "First Name:" in grid
And I should see "Last Name:" in grid
And I should see "Primary Email:" in grid

0 comments on commit d3ccdec

Please sign in to comment.