Merge remote-tracking branch 'origin/master'

Evolveum · Aug 25, 2017 · c97d88e · c97d88e
2 parents add5eeb + e1a3087
commit c97d88e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
@@ -23,6 +23,7 @@
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -33,6 +34,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.Validate;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -80,13 +83,25 @@ public boolean isAlreadyShown() {
     public void setAlreadyShown(boolean alreadyShown) {
 		this.alreadyShown = alreadyShown;
 	}
-
-    public static OpResult getOpResult(PageBase page, OperationResult result){
+    
+        public static OpResult getOpResult(PageBase page, OperationResult result){
         OpResult opResult = new OpResult();
         Validate.notNull(result, "Operation result must not be null.");
         Validate.notNull(result.getStatus(), "Operation result status must not be null.");
 
-        opResult.message = result.getMessage();
+        if (result.getCause() != null && result.getCause() instanceof CommonException){
+        	LocalizableMessage localizableMessage = ((CommonException) result.getCause()).getUserFriendlyMessage();
+        	if (localizableMessage != null) {
+        		String key = localizableMessage.getKey() != null ? localizableMessage.getKey() : localizableMessage.getFallbackMessage();
+        		StringResourceModel stringResourceModel = new StringResourceModel(key, page).setModel(new Model<String>()).setDefaultValue(localizableMessage.getFallbackMessage())
+				.setParameters(localizableMessage.getArgs());
+        		opResult.message = stringResourceModel.getString();
+        	}
+        } 
+
+        if (opResult.message == null) {
+        	opResult.message = result.getMessage();
+        }
         opResult.operation = result.getOperation();
         opResult.status = result.getStatus();
         opResult.count = result.getCount();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -969,28 +969,12 @@ public OpResult showResult(OperationResult result) {
     public OpResult showResult(OperationResult result, String errorMessageKey, boolean showSuccess) {
         Validate.notNull(result, "Operation result must not be null.");
         Validate.notNull(result.getStatus(), "Operation result status must not be null.");
-
-        if (result.getCause() != null && result.getCause() instanceof CommonException){
-        	LocalizableMessage localizableMessage = ((CommonException) result.getCause()).getUserFriendlyMessage();
-        	if (localizableMessage != null) {
-        		String key = localizableMessage.getKey() != null ? localizableMessage.getKey() : localizableMessage.getFallbackMessage();
-        		StringResourceModel stringResourceModel = new StringResourceModel(key, this).setModel(new Model<String>()).setDefaultValue(localizableMessage.getFallbackMessage())
-				.setParameters(localizableMessage.getArgs());
-        		getSession().error(stringResourceModel.getString());
-
-        		OpResult opResult = new OpResult();
-//        		opResult.setMessage(message);
-        		return opResult;
-        	}
-        }
 
         OpResult opResult = OpResult.getOpResult((PageBase) getPage(), result);
 		opResult.determineBackgroundTaskVisibility(this);
         switch (opResult.getStatus()) {
             case FATAL_ERROR:
             case PARTIAL_ERROR:
-
-
                 getSession().error(opResult);
 
                 break;

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
@@ -236,7 +236,7 @@ ContainerValuePanel.label.attribute=Атрибут
 ContainerValuePanel.label.value=Значения
 contentPanel.accounts=Содержание
 contentPanel.entitlements=Права доступа
-CountToolbar.label={0,число,целое} до {1,число,целое} из {2,число,целое}
+CountToolbar.label={0,number,integer} до {1,number,integer} из {2,number,integer}
 CountToolbar.noFound=Не найдено соответствий
 DateValidator.message.fromAfterTo=Дата "Действительно с" должна быть меньше, чем дата "Действительно по".
 DebugButtonPanel.button.delete=Удалить