MID-4521 Policy breach message is not localized in self-service

Evolveum · Sep 26, 2018 · 5873250 · 5873250
1 parent d5ffaaa
commit 5873250
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskCategory;
+import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -262,7 +263,13 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
             storage.getRoleCatalog().getAssignmentShoppingCart().clear();
         } catch (Exception e) {
             LoggingUtils.logUnexpectedException(LOGGER, "Could not save assignments ", e);
-            error(createStringResource("PageAssignmentsList.saveAssignmentsError").getString() + e.getLocalizedMessage());
+            result.recordFatalError(e);
+            if (e instanceof CommonException){
+                error(createStringResource("PageAssignmentsList.saveAssignmentsError").getString() +
+                        ((CommonException) e).getLocalizedUserFriendlyMessage());
+            } else {
+                error(createStringResource("PageAssignmentsList.saveAssignmentsError").getString() + e.getLocalizedMessage());
+            }
             target.add(getFeedbackPanel());
         } finally {
             result.recomputeStatus();
@@ -452,7 +459,7 @@ private List<ConflictDto> getAssignmentConflicts(){
                     .getEvaluatedAssignmentTriple();
             Collection<? extends EvaluatedAssignment> addedAssignments = evaluatedAssignmentTriple.getPlusSet();
             for (EvaluatedAssignment<UserType> evaluatedAssignment : addedAssignments) {
-            	
+
                 for (EvaluatedPolicyRule policyRule : evaluatedAssignment.getAllTargetsPolicyRules()) {
                     if (!policyRule.containsEnabledAction()) {
                         continue;