Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · May 18, 2017 · 29731b5 · 29731b5
2 parents 650b785 + 6e713a7
commit 29731b5
Show file tree

Hide file tree

Showing 36 changed files with 4,856 additions and 341 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml b/gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2016 Evolveum
+  ~ Copyright (c) 2016-2017 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -64,4 +64,23 @@
     		<type>ShadowType</type>
     	</object>
     </authorization>
+        <authorization>
+    	<name>delegator-read-delagate-assignments</name>
+    	<description>
+    		Authorization to read the assignments and assignment-related items from my delegates.
+    		This authorization is necessary so the self-service GUI can properly display user's
+    		delegations. Delegations are in fact assignments in the delegate object, not delegator
+    		object. Therefore authorization to read just "self" will not display the delegations.
+    	</description>
+    	<action>http://midpoint.evolveum.com/xml/ns/public/security/authorization-model-3#read</action>
+    	<object>
+    		<type>UserType</type>
+    		<delegator>
+    			<special>self</special>
+    		</delegator>
+    	</object>
+    	<item>assignment</item>
+    	<item>roleMembershipRef</item>
+    	<item>delegatedRef</item>
+    </authorization>
 </role>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml b/gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
@@ -64,5 +64,9 @@
 		<key>tr</key>
 		<label>Türkçe</label>
 	</row>
+	<row>
+		<key>zh_CN</key>
+		<label>中文</label>
+	</row>
 
 </lookupTable>
diff --git a/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml b/gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
@@ -64,5 +64,9 @@
 		<key>tr</key>
 		<label>Türkçe</label>
 	</row>
+	<row>
+		<key>zh_CN</key>
+		<label>中文</label>
+	</row>
 
 </lookupTable>
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -1108,6 +1108,7 @@ pageAdminFocus.button.delete=Smazat
 pageAdminFocus.button.addToOrg=Přidat do organizace
 pageAdminFocus.focusDetails=Detaily
 pageAdminFocus.projections=Projekce
+pageAdminFocus.personas=Osoby
 pageAdminFocus.organizations=Organizace
 pageAdminFocus.assignments=Přiřazení
 pageAdminFocus.message.couldntCreateAccountNoSchema=Nepodařilo se vytvořit projekci pro '{0}', není dostupné upravené schéma. Možný problém s konfigurací konektoru nebo spojením. Více informací najdete v logu.
@@ -2513,6 +2514,8 @@ runReportPopupContent.param.name.situation=Situace
 runReportPopupContent.param.name.activation=Aktivace
 runReportPopupContent.param.name.organization=Organizace
 runReportPopupContent.param.name.role=Role
+runReportPopupContent.param.name.roleOids=Role
+runReportPopupContent.param.name.users=Uživatelé
 runReportPopupContent.param.name.stageNumber=Číslo fáze (výchozí nastavení je všechny fáze)
 RunReportPopupPanel.title=Konfigurace reportu před spuštěním
 runUntilNodeDown.error1=Správná data pro akci 'Zastavení vlákna' jsou\: Close, Suspend
@@ -3445,7 +3448,7 @@ AssignmentCatalogPanel.requestForMultiple=vybráno {0} uživatelů
 AssignmentCatalogPanel.assignmentsOwner=Přiřazení identity {0}
 MultiButtonPanel.plusIconTitle=Přidat položku do nákupního košíku
 MultiButtonPanel.assignmentDetailsPopupTitle=Podrobnosti přiřazení
-MultiButtonPanel.detailsLink=Podrobnosti
+MultiButtonPanel.detailsLink=Vlastnosti
 MultiButtonPanel.addToCartLink=Přidat do košíku
 MultiButtonPanel.alreadyAssignedIconTitle=Již přiřazeno
 PageAssignmentDetails.title=Podrobnosti přiřazení
@@ -3482,7 +3485,7 @@ PageAuditLogViewer.eventStageLabel=Fáze události
 PageAuditLogViewer.eventStageShortLabel=Fáze
 PageAuditLogViewer.outcomeLabel=Výsledek
 PageAuditLogViewer.changedItem=Změněná položka
-PageAuditLogViewer.valueRefTargetNamesLabel=Reference Target
+PageAuditLogViewer.valueRefTargetNamesLabel=Cíl odkazu
 AuditLogViewerPanel.dateValidatorMessage=Položka Datum od musí být před položkou Datum do.
 AuditEventRecordType.timestamp=Čas
 AuditEventRecordType.initiatorRef=Iniciátor

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
@@ -1108,6 +1108,7 @@ pageAdminFocus.button.delete=Löschen
 pageAdminFocus.button.addToOrg=zu Organisation hinzufügen
 pageAdminFocus.focusDetails=Details
 pageAdminFocus.projections=Prognosen
+pageAdminFocus.personas=Personas
 pageAdminFocus.organizations=Organisationen
 pageAdminFocus.assignments=Aufgaben
 pageAdminFocus.message.couldntCreateAccountNoSchema=Erstellung der Vorschauansicht '{0}' nicht möglich, es ist kein detailliertes Schema verfügbar. Möglicherweise besteht ein Problem mit der Konnektor Konfiguration und/oder der Verbindung. Bitte Logfiles für mehre Informationen überprüfen.
@@ -2513,6 +2514,8 @@ runReportPopupContent.param.name.situation=Situation
 runReportPopupContent.param.name.activation=Aktivierung
 runReportPopupContent.param.name.organization=Organisation
 runReportPopupContent.param.name.role=Rolle
+runReportPopupContent.param.name.roleOids=Roles
+runReportPopupContent.param.name.users=Users
 runReportPopupContent.param.name.stageNumber=Stage number (default is to take all stages)
 RunReportPopupPanel.title=Report configuration before run
 runUntilNodeDown.error1=Compatible data for 'Thread stop action' are\: Close, Suspend
@@ -3445,7 +3448,7 @@ AssignmentCatalogPanel.requestForMultiple={0} users selected
 AssignmentCatalogPanel.assignmentsOwner={0}'s assignments
 MultiButtonPanel.plusIconTitle=Add item to shopping cart
 MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details
-MultiButtonPanel.detailsLink=Details
+MultiButtonPanel.detailsLink=Properties
 MultiButtonPanel.addToCartLink=Add to cart
 MultiButtonPanel.alreadyAssignedIconTitle=Already assigned
 PageAssignmentDetails.title=Assignment details

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -1108,6 +1108,7 @@ pageAdminFocus.button.delete=Delete
 pageAdminFocus.button.addToOrg=Add to organization
 pageAdminFocus.focusDetails=Details
 pageAdminFocus.projections=Projections
+pageAdminFocus.personas=Personas
 pageAdminFocus.organizations=Organizations
 pageAdminFocus.assignments=Assignments
 pageAdminFocus.message.couldntCreateAccountNoSchema=Couldn't create projection form for '{0}', no refined schema available. Possible problem with connector configuration and/or connection. Please check logs for more information.
@@ -2513,6 +2514,8 @@ runReportPopupContent.param.name.situation=Situation
 runReportPopupContent.param.name.activation=Activation
 runReportPopupContent.param.name.organization=Organization
 runReportPopupContent.param.name.role=Role
+runReportPopupContent.param.name.roleOids=Roles
+runReportPopupContent.param.name.users=Users
 runReportPopupContent.param.name.stageNumber=Stage number (default is to take all stages)
 RunReportPopupPanel.title=Report configuration before run
 runUntilNodeDown.error1=Compatible data for 'Thread stop action' are\: Close, Suspend