Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Apr 12, 2023 · 9347e00 · 9347e00
2 parents 27cabee + b521534
commit 9347e00
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/repo/system-init/src/main/resources/initial-objects/archetype/700-archetype-event-mark.xml b/repo/system-init/src/main/resources/initial-objects/archetype/700-archetype-event-mark.xml
@@ -14,5 +14,15 @@
             <holderType>MarkType</holderType>
         </assignmentRelation>
     </assignment>
+    <archetypePolicy>
+        <display>
+            <label>Event Mark</label>
+            <pluralLabel>Event Marks</pluralLabel>
+            <icon>
+                <cssClass>fa fa-tag</cssClass>
+                <color>green</color>
+            </icon>
+        </display>
+    </archetypePolicy>
     <archetypeType>structural</archetypeType>
 </archetype>
diff --git a/...init/src/main/resources/initial-objects/system-configuration/000-system-configuration.xml b/...init/src/main/resources/initial-objects/system-configuration/000-system-configuration.xml
@@ -825,6 +825,24 @@
                     <collectionRef oid="00000000-0000-0000-0000-000000000329" relation="org:default" type="c:ArchetypeType"/>
                 </collection>
             </objectCollectionView>
+            <objectCollectionView>
+                <identifier>event-mark</identifier>
+                <type>c:MarkType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000700" relation="org:default" type="c:ArchetypeType">
+                        <!-- Event mark -->
+                    </collectionRef>
+                </collection>
+            </objectCollectionView>
+            <objectCollectionView>
+                <identifier>object-mark</identifier>
+                <type>c:MarkType</type>
+                <collection>
+                    <collectionRef oid="00000000-0000-0000-0000-000000000701" relation="org:default" type="c:ArchetypeType">
+                        <!-- Object mark -->
+                    </collectionRef>
+                </collection>
+            </objectCollectionView>
         </objectCollectionViews>
         <objectDetails>
             <objectDetailsPage>