MID-3065 displayName attribute is updated in schema and contains now …

…the property key instead of real displayed value
Evolveum · May 25, 2016 · 00a407d · 00a407d
1 parent 79c2b9b
commit 00a407d
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 65 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
@@ -290,7 +290,9 @@ private IModel<String> createDisplayName(final IModel<IW> model) {
             public String getObject() {
                 IW wrapper = model.getObject();
                 String displayName = wrapper.getDisplayName();
-                return getString(displayName, null, displayName);
+                String displayNameValueByKey = PageBase.createStringResourceStatic(PrismPropertyPanel.this, displayName).getString();
+                return StringUtils.isEmpty(displayNameValueByKey) ?
+                        getString(displayName, null, displayName) : displayNameValueByKey;
             }
         };
     }

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3360,3 +3360,52 @@ OrgTreeAssignablePanel.selectOrg=Select organization(s)
 ChooseFocusTypeDialogPanel.chooseType=Choose type
 TestConnectionResultPanel.testConnection.result=Test connection result(s)
  operation.com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration.updateSystemConfiguration=Update system configuration (GUI)
+OrgType.parentOrganization=Parent Organization
+ObjectType.extension=Extension
+FocusType.assignmentKey=Assignment
+FocusType.jpegPhoto=Jpeg photo
+UserType.additionalName=Additional Name
+UserType.nickname=Nickname
+UserType.honorificPrefix=Honorific Prefix
+UserType.honorificSuffix=Honorific Suffix
+UserType.title=Title
+UserType.preferredLanguage=Preferred Language
+UserType.locale=Locale
+UserType.timezone=Timezone
+UserType.EmailAddress=Email Address
+UserType.telephoneNumber=Telephone Number
+UserType.employeeNumber=Employee Number
+UserType.employeeType=Employee Type
+UserType.costCenter=Cost Center
+UserType.organization=Organization
+UserType.organizationalUnit=Organizational Unit
+UserType.locality=Locality
+UserType.credentials=Credentials
+CredentialsType.password=Password
+CredentialsType.securityQuestions=Security Questions
+AssignmentType.assignment=Assignment
+AssignmentType.target=Target
+AssignmentType.construction=Construction
+AssignmentType.tenantReference=Tenant reference
+AssignmentType.orgReference=Org reference
+ActivationType.activation=Activation
+ActivationType.validityStatus=Validity Status
+ActivationType.lockOutStatus=Lock-out Status
+ActivationType.lockOutExpiration=Lock-out Expiration
+ConnectorType.displayName=Display Name
+ShadowType.activation=Activation
+AbstractRoleType.inducement=Inducement
+AbstractRoleType.requestable=Requestable
+AbstractRoleType.riskLevel=Risk Level
+AbstractRoleType.owner=Owner
+AbstractRoleType.approver=Approver
+RoleType.roleType=Role Type
+OrgType.type=Type
+OrgType.isTenant=Is Tenant
+OrgType.CostCenter=Cost Center
+OrgType.displayOrder=Display Order
+OrgType.passwordPolicy=Password Policy
+ServiceType.type=Type
+ServiceType.locality=Locality
+ServiceType.displayOrder=Display Order
+ServiceType.URL=URL
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3275,3 +3275,52 @@ StageDefinitionPanel.outcomeIfNoReviewersHelp=What should be the outcome if ther
 StageDefinitionPanel.stopReviewOnHelp=What outcomes will prevent a case from being advanced to the next stage? Usually you need not change the default value. If necessary, you could do that through the XML configuration.
 StageDefinitionPanel.configurationHelpLabel=For more information about configuring certification campaign stages, please see also
 StageDefinitionPanel.configurationHelpLink=this document
+OrgType.parentOrganization=Parent Organization
+ObjectType.extension=Extension
+FocusType.assignmentKey=Assignment
+FocusType.jpegPhoto=Jpeg photo
+UserType.additionalName=Additional Name
+UserType.nickname=Nickname
+UserType.honorificPrefix=Honorific Prefix
+UserType.honorificSuffix=Honorific Suffix
+UserType.title=Title
+UserType.preferredLanguage=Preferred Language
+UserType.locale=Locale
+UserType.timezone=Timezone
+UserType.EmailAddress=Email Address
+UserType.telephoneNumber=Telephone Number
+UserType.employeeNumber=Employee Number
+UserType.employeeType=Employee Type
+UserType.costCenter=Cost Center
+UserType.organization=Organization
+UserType.organizationalUnit=Organizational Unit
+UserType.locality=Locality
+UserType.credentials=Credentials
+CredentialsType.password=Password
+CredentialsType.securityQuestions=Security Questions
+AssignmentType.assignment=Assignment
+AssignmentType.target=Target
+AssignmentType.construction=Construction
+AssignmentType.tenantReference=Tenant reference
+AssignmentType.orgReference=Org reference
+ActivationType.activation=Activation
+ActivationType.validityStatus=Validity Status
+ActivationType.lockOutStatus=Lock-out Status
+ActivationType.lockOutExpiration=Lock-out Expiration
+ConnectorType.displayName=Display Name
+ShadowType.activation=Activation
+AbstractRoleType.inducement=Inducement
+AbstractRoleType.requestable=Requestable
+AbstractRoleType.riskLevel=Risk Level
+AbstractRoleType.owner=Owner
+AbstractRoleType.approver=Approver
+RoleType.roleType=Role Type
+OrgType.type=Type
+OrgType.isTenant=Is Tenant
+OrgType.CostCenter=Cost Center
+OrgType.displayOrder=Display Order
+OrgType.passwordPolicy=Password Policy
+ServiceType.type=Type
+ServiceType.locality=Locality
+ServiceType.displayOrder=Display Order
+ServiceType.URL=URL