Merge remote-tracking branch 'origin/master'

Evolveum · Dec 12, 2018 · 92ec337 · 92ec337
2 parents 33c751e + 1266756
commit 92ec337
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -4306,6 +4306,7 @@ WorkItemNotificationActionType.details.newValue=New work item notification actio
 ResourceObjectAssociationType.details.newValue=New resource object association
 ResourceAttributeDefinitionType.details.newValue=New resource attribute definition
 MappingType.details.newValue=New mapping
+FullTextSearchIndexedItemsConfigurationType.details.newValue=New full text search indexed items
 objectState.details=Object state
 assignmentState.details=Assignment state
 hasAssignment.details=Has assignment

diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
@@ -275,6 +275,9 @@ FileConfigurationType.name=Name
 FileConfigurationType.file=File
 FullTextSearchConfigurationType.enabled=Enabled
 FullTextSearchConfigurationType.indexed=Indexed
+FullTextSearchIndexedItemsConfigurationType.details=Full text search indexed items
+FullTextSearchIndexedItemsConfigurationType.objectType=Object type
+FullTextSearchIndexedItemsConfigurationType.item=Item
 FocusType.activation=Activation
 FocusType.assignment=Assignments
 FocusType.inducement=Inducements

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -14965,6 +14965,8 @@
 			</xsd:documentation>
 			<xsd:appinfo>
 				<a:since>3.6</a:since>
+				<a:container/>
+				<a:displayName>FullTextSearchIndexedItemsConfigurationType.details</a:displayName>
 			</xsd:appinfo>
 		</xsd:annotation>
 		<xsd:sequence>
@@ -14974,13 +14976,19 @@
 						To what object type(s) should this entry be applied.
 						Empty list means "all object types".
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>FullTextSearchIndexedItemsConfigurationType.objectType</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="item" type="t:ItemPathType" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>
 						What items to index for the given object type(s).
 					</xsd:documentation>
+					<xsd:appinfo>
+						<a:displayName>FullTextSearchIndexedItemsConfigurationType.item</a:displayName>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>