Skip to content

Commit

Permalink
adding display names of properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Jul 18, 2018
1 parent 91bd2f6 commit a261a27
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 22 deletions.
21 changes: 0 additions & 21 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
View file
Expand Up @@ -128,27 +128,6 @@ public String getObject() {
}

private void addOrReplaceProperties(IModel<ContainerWrapper<C>> model, final Form form, ItemVisibilityHandler isPanelVisible, boolean isToBeReplaced){

// LOGGER.info("XXXXXXXXXXXXXXX model name: " + model.getObject().getItemDefinition().getName().getLocalPart());
// LOGGER.info("XXXXXXXXXXXXXXX isMultiValue: " + model.getObject().getItemDefinition().isMultiValue());
// LOGGER.info("XXXXXXXXXXXXXXX values: " + model.getObject().getValues());
//
// if(model.getObject().getItemDefinition().isMultiValue()) {
// ContainerValueWrapper<C> container = new ContainerValueWrapper<C>(model.getObject(), model.getObject().getItem().createNewValue(), model.getObject().getObjectStatus(), ValueStatus.NOT_CHANGED, model.getObject().getPath());
// List<ItemWrapper> properties = new ArrayList<>();
// model.getObject().getValues().forEach(item -> {
// properties.add(item.getContainer());
// });
// container.setProperties(properties);
// model = new LoadableModel<ContainerWrapper<C>>(false) {
// private static final long serialVersionUID = 1L;
//
// @Override
// protected ContainerWrapper<C> load() {
// return container.getContainer();
// }
// };
// }
ListView<ContainerValueWrapper<C>> values = new ListView<ContainerValueWrapper<C>>("values", new PropertyModel<List<ContainerValueWrapper<C>>>(model, "values")) {

private static final long serialVersionUID = 1L;
Expand Down
62 changes: 62 additions & 0 deletions infra/schema/src/main/resources/localization/schema.properties
View file
Expand Up @@ -48,6 +48,8 @@ ActivityType.NOTIFICATIONS=Sending notifications
ActivityType.PROJECTOR=Computing projections of the focus object
ActivityType.RESOURCE_OBJECT_OPERATION=Operation on resource object
ActivityType.WORKFLOWS=Considering or starting approval workflows
ApplicablePoliciesType.policyGroupRef=Policy group
AssignmentModificationPolicyConstraintType.relation=Relation
AssignmentPolicyEnforcementType.FULL=Full
AssignmentPolicyEnforcementType.LEGALIZE=Legalize
AssignmentPolicyEnforcementType.MARK=Mark
Expand Down Expand Up @@ -139,6 +141,9 @@ CapabilitiesType.script=Script
ChangeType.ADD=Add
ChangeType.DELETE=Delete
ChangeType.MODIFY=Modify
ConflictResolutionType.action=Action
ConflictResolutionType.maxAttempts=Max attempts
ConflictResolutionType.delayUnit=Delay unit
ConnectorOperationalStatus.connectorClassName=Connector class name
ConnectorOperationalStatus.poolConfigMinSize=Minimum pool size
ConnectorOperationalStatus.poolConfigMaxSize=Maximum pool size
Expand All @@ -163,6 +168,26 @@ FocusType.inducement=Inducements
FocusType.delegations=Delegations
FocusType.delegatedToMe=Delegated to me
FocusType.displayName=Display Name
GlobalPolicyRuleType.focusSelector=Focus selector
GlobalPolicyRuleType.targetSelector=Target selector
GlobalPolicyRuleType.condition=Condition
HasAssignmentPolicyConstraintType.targetRef=Target
HasAssignmentPolicyConstraintType.enabled=Enable
HasAssignmentPolicyConstraintType.direct=Direct
HasAssignmentPolicyConstraintType.relation=Relation
LifecycleStateTransitionType.name=Name
LifecycleStateTransitionType.description=Description
LifecycleStateTransitionType.targetState=Target state
LifecycleStateTransitionType.condition=Condition
LifecycleStateType.name=Name
LifecycleStateType.description=Description
LifecycleStateType.displayName=Display name
LifecycleStateType.forcedActivationStatus=Forced activation status
LifecycleStateType.forcedAssignment=Forced assignment
LifecycleStateType.activeAssignments=Active assignments
LifecycleStateType.entryAction=Entry action
LifecycleStateType.exitAction=Exit action
LifecycleStateType.transition=Transition
LockoutStatusType.LOCKED=Locked
LockoutStatusType.NORMAL=Normal
LockoutStatusType.UNDEFINED=Undefined
Expand Down Expand Up @@ -194,11 +219,22 @@ MappingStrengthType.STRONG=Strong
MappingStrengthType.WEAK=Weak
MisfireActionType.EXECUTE_IMMEDIATELY=Execute immediately
MisfireActionType.RESCHEDULE=Reschedule
ModificationPolicyConstraintType.operation=Operation
ModificationPolicyConstraintType.item=Item
ModificationPolicyConstraintType.exactPathMatch=Exactly path match
ModificationPolicyConstraintType.expression=Expression
MultiplicityPolicyConstraintType.multiplicity=Multiplicity
MultiplicityPolicyConstraintType.relation=Relation
NodeExecutionStatusType.COMMUNICATION_ERROR=Unreachable
NodeExecutionStatusType.DOWN=Turned off
NodeExecutionStatusType.ERROR=Error
NodeExecutionStatusType.PAUSED=Stopped
NodeExecutionStatusType.RUNNING=Running
ObjectSelectorType.description=Description
ObjectSelectorType.type=Type
ObjectSelectorType.subtype=Subtype
ObjectSelectorType.orgRef=Organization
ObjectSelectorType.filter=Filter
ObjectType.description=Description
ObjectType.AbstractRoleType=Abstract role
ObjectType.AccessCertificationCampaignType=Access certification campaign
Expand Down Expand Up @@ -281,6 +317,9 @@ AccessCertificationRemediationStyleType.REPORT_ONLY=Manual reconciliation (non-c
PolicyConstraintEnforcementType.ENFORCE=Enforce
PolicyConstraintEnforcementType.REMEDIATE=Remediate
PolicyConstraintEnforcementType.REPORT=Report
PolicyConstraintReferenceType.name=Name
PolicySituationPolicyConstraintType.situation=Situation
RecordPolicyActionType.policyRules=Policy rules
ReportType.export=Export
ReportType.orientation=Orientation
ReportType.parent=Parent
Expand All @@ -304,6 +343,10 @@ ShadowType.synchronizationSituation=Situation
ShadowKindType.ACCOUNT=Account
ShadowKindType.ENTITLEMENT=Entitlement
ShadowKindType.GENERIC=Generic
StatePolicyConstraintType.filter=Filter
StatePolicyConstraintType.expression=Expression
StatePolicyConstraintType.messageExpression=Message expression
StatePolicyConstraintType.executeScript=Execute script
SynchronizationSituationType.DELETED=Deleted
SynchronizationSituationType.DISPUTED=Disputed
SynchronizationSituationType.LINKED=Linked
Expand All @@ -314,6 +357,13 @@ ThreadStopActionType.CLOSE=Close
ThreadStopActionType.RESCHEDULE=Reschedule
ThreadStopActionType.RESTART=Restart
ThreadStopActionType.SUSPEND=Suspend
TimeValidityPolicyConstraintType.item=Item
TimeValidityPolicyConstraintType.assignment=Assignment
TimeValidityPolicyConstraintType.activateOn=Activate on
TimeValidityPolicyConstraintType.deactivateOn=Deactivate on
TransitionPolicyConstraintType.stateBefore=State before
TransitionPolicyConstraintType.stateAfter=State after
TransitionPolicyConstraintType.constraints=Constraints
FocusType.emailAddress=Email
UserType.familyName=Family name
UserType.fullName=Full name
Expand Down Expand Up @@ -396,6 +446,13 @@ AbstractRoleType.owner=Owner
AbstractRoleType.approver=Approver
AbstractRoleType.idempotent=Idempotent
RoleType.roleType=Role Type
ObjectPolicyConfigurationType.type=Type
ObjectPolicyConfigurationType.subtype=Subtype
ObjectPolicyConfigurationType.objectTemplateRef=Object policy
ObjectPolicyConfigurationType.propertyConstraint=Property Constraint
ObjectPolicyConfigurationType.conflictResolution=Conflict Resolution
ObjectPolicyConfigurationType.lifecycleStateModel=Lifecycle State Model
ObjectPolicyConfigurationType.applicablePolicies=Applicable Policies
OrgType.type=Type
OrgType.isTenant=Is Tenant
OrgType.displayOrder=Display Order
Expand All @@ -404,6 +461,8 @@ OrgType.passwordPolicy=Password Policy
ServiceType.type=Type
ServiceType.displayOrder=Display Order
ServiceType.URL=URL
SystemConfigurationType.globalSecurityPolicyRef=Global security policy
PropertyConstraintType.path=Path
ResourceAttribute.connIdName=ConnId Name
ResourceAttribute.connIdUID=ConnId UID
ResourceValidator.noSchema=Resource schema is not available: {0}
Expand Down Expand Up @@ -575,6 +634,9 @@ PolicyConstraintsType.ref=Reference
PolicyConstraintsType.ref.help=References another policy constraint e.g. by its name.
ExclusionPolicyConstraintType.targetRef=Target
ExclusionPolicyConstraintType.targetRef.help=Target of exclusion. The object defining this "exclusion" and the object defined as target cannot be assigned at the same time.
ExclusionPolicyConstraintType.orderConstraint=Order constraint
ExclusionPolicyConstraintType.targetOrderConstraint=Target order constraint
ExclusionPolicyConstraintType.policy=Policy
PolicyActionsType.enforcement=Enforcement
PolicyActionsType.enforcement.help=This action stops the operation and results with the error.
PolicyActionsType.approval=Approval
Expand Down
34 changes: 33 additions & 1 deletion infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Expand Up @@ -13670,6 +13670,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:objectReferenceTargetType>tns:SecurityPolicyType</a:objectReferenceTargetType>
<a:displayName>SystemConfigurationType.globalSecurityPolicyRef</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -14495,6 +14496,9 @@
<xsd:documentation>
Specification of the type (class) of the object to apply this definition to.
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ObjectPolicyConfigurationType.type</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="subtype" type="xsd:string" minOccurs="0">
Expand All @@ -14505,6 +14509,9 @@
The subtype is compared against the subtype property but it is also compared to the
deprecated employeeType, roleType, orgType and serviceType properties.
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ObjectPolicyConfigurationType.subtype</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="objectTemplateRef" type="tns:ObjectReferenceType">
Expand All @@ -14514,10 +14521,17 @@
</xsd:documentation>
<xsd:appinfo>
<a:objectReferenceTargetType>tns:ObjectTemplateType</a:objectReferenceTargetType>
<a:displayName>ObjectPolicyConfigurationType.objectTemplateRef</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="propertyConstraint" type="tns:PropertyConstraintType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>ObjectPolicyConfigurationType.propertyConstraint</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="propertyConstraint" type="tns:PropertyConstraintType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="oidNameBoundMode" type="xsd:boolean" minOccurs="0" default="false">
<xsd:annotation>
<xsd:documentation>
Expand All @@ -14536,6 +14550,7 @@
<xsd:appinfo>
<a:since>3.6.1</a:since>
<a:experimental>true</a:experimental>
<a:displayName>ObjectPolicyConfigurationType.conflictResolution</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -14547,6 +14562,7 @@
<xsd:appinfo>
<a:since>3.7.1</a:since>
<a:experimental>true</a:experimental>
<a:displayName>ObjectPolicyConfigurationType.lifecycleStateModel</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -14561,6 +14577,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:since>3.8</a:since>
<a:displayName>ObjectPolicyConfigurationType.applicablePolicies</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand Down Expand Up @@ -14595,6 +14612,7 @@
</xsd:documentation>
<xsd:appinfo>
<a:objectReferenceTargetType>tns:OrgType</a:objectReferenceTargetType>
<a:displayName>ApplicablePoliciesType.policyGroupRef</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
Expand All @@ -14618,13 +14636,19 @@
<xsd:documentation>
What action to take.
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ConflictResolutionType.action</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="maxAttempts" type="xsd:int" minOccurs="0" default="1"> <!-- synchronize with Clockwork.java -->
<xsd:annotation>
<xsd:documentation>
How many attempts to undertake at most.
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ConflictResolutionType.maxAttempts</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<xsd:element name="delayUnit" type="xsd:int" minOccurs="0" default="5000"> <!-- synchronize with Clockwork.java -->
Expand All @@ -14635,6 +14659,9 @@
starting at 1. (In other words, the potential delay is multiplied by two after each unsuccessful
resolution attempt.)
</xsd:documentation>
<xsd:appinfo>
<a:displayName>ConflictResolutionType.delayUnit</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
Expand Down Expand Up @@ -14741,6 +14768,11 @@
</xsd:annotation>
<xsd:sequence>
<xsd:element name="path" type="t:ItemPathType" minOccurs="1" maxOccurs="1">
<xsd:annotation>
<xsd:appinfo>
<a:displayName>PropertyConstraintType.path</a:displayName>
</xsd:appinfo>
</xsd:annotation>
</xsd:element>
<!-- TODO: uniqueness constraint -->
<xsd:element name="oidBound" type="xsd:boolean" minOccurs="0" default="false">
Expand Down

0 comments on commit a261a27

Please sign in to comment.