From 6698bbe0fac1c0a0191b17013584df3f0b25df5a Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Fri, 23 Jun 2017 09:42:41 +0200 Subject: [PATCH 1/2] relation = org:manager changed to manager to test MID-3660 --- .../resources/object-template-ranges/user-template-ranges.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index f1686f359dd..492fe341de6 100644 --- 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 @@ - org:manager + manager From ae46083b6a96e6247d5379f675a51af170240442 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Fri, 23 Jun 2017 09:54:18 +0200 Subject: [PATCH 2/2] fixing https://jira.evolveum.com/browse/MID-3077 --- .../src/main/resources/localization/Midpoint.properties | 2 +- .../src/main/resources/localization/Midpoint_en.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index ed91c932bd0..67552d3897b 100644 --- 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 index 84bdf080009..77f6346c6d8 100644 --- 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