test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-6333 Restrict error notification content for "run report" errors

Browse Source
This commit is contained in:
Daniil Tsarev 2018-02-13 15:24:44 +04:00
parent af6f956b49
commit cc28ab0ccb
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gui/src/com/haulmont/cuba/gui/backgroundwork/LocalizedTaskWrapper.java
View File

@ -25,7 +25,6 @@ import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.executors.BackgroundTask;
import com.haulmont.cuba.gui.executors.BackgroundWorker;
import com.haulmont.cuba.gui.executors.TaskLifeCycle;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -122,18 +121,10 @@ public class LocalizedTaskWrapper<T, V> extends BackgroundTask<T, V> {
protected void showExecutionError(Exception ex) {
Frame ownerFrame = wrappedTask.getOwnerFrame();
if (ownerFrame != null) {
String localizedMessage = ex.getLocalizedMessage();
Messages messages = AppBeans.get(Messages.NAME);
if (StringUtils.isNotBlank(localizedMessage)) {
ownerFrame.showNotification(
messages.getMessage(LocalizedTaskWrapper.class, "backgroundWorkProgress.executionError"),
localizedMessage, NotificationType.WARNING);
} else {
ownerFrame.showNotification(
messages.getMessage(LocalizedTaskWrapper.class, "backgroundWorkProgress.executionError"),
NotificationType.WARNING);
}
window.getWindowManager().showExceptionDialog(
ex,
AppBeans.get(Messages.class).getMessage(LocalizedTaskWrapper.class, "backgroundWorkProgress.executionError"),
ex.getLocalizedMessage());
}
}
}