Merge remote-tracking branch 'origin/master'

Evolveum · Jun 23, 2017 · 511182b · 511182b
2 parents 13b823b + 1ca3028
commit 511182b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1478,7 +1478,7 @@ PageCreatedReports.title=Created Reports
 PageDashboard.accounts=My accounts
 PageDashboard.activeTasks=Active Tasks
 PageDashboard.activeUsers=Active Users
-PageDashboard.assignments=My Assignments
+PageDashboard.assignments=My assignments
 PageDashboard.personalInfo=Personal info
 PageDashboard.serverLoad=Server Load
 PageDashboard.systemInfo=System status

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -1474,7 +1474,7 @@ PageCreatedReports.title=Created Reports
 PageDashboard.accounts=My accounts
 PageDashboard.activeTasks=Active Tasks
 PageDashboard.activeUsers=Active Users
-PageDashboard.assignments=My Assignments
+PageDashboard.assignments=My assignments
 PageDashboard.personalInfo=Personal info
 PageDashboard.serverLoad=Server Load
 PageDashboard.systemInfo=System status

diff --git a/model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml b/model/model-intest/src/test/resources/object-template-ranges/user-template-ranges.xml
@@ -42,7 +42,7 @@
 							</expression>
 						</q:equal>
 					</filter>
-					<relation>org:manager</relation>
+					<relation>manager</relation>
 				</assignmentTargetSearch>
 			</expression>
 			<target>