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-7959 Row level security notifications in desktop should be the same as in the web app

Browse Source
This commit is contained in:
Daniil Tsarev 2016-10-25 10:01:30 +04:00
parent 8436e21409
commit 29826194b9
2 changed files with 17 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
modules/web/src/com/haulmont/cuba/web/exception/RowLevelSecurityExceptionHandler.java → modules/gui/src/com/haulmont/cuba/gui/exception/RowLevelSecurityExceptionHandler.java
View File

@ -12,70 +12,41 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.haulmont.cuba.web.exception;
package com.haulmont.cuba.gui.exception;
import com.google.common.collect.Iterables;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.RowLevelSecurityException;
import com.haulmont.cuba.gui.WindowManager;
import com.haulmont.cuba.gui.components.Frame;
import com.haulmont.cuba.security.entity.ConstraintOperationType;
import com.haulmont.cuba.web.App;
import com.haulmont.cuba.web.Connection;
import com.haulmont.cuba.web.WebWindowManager;
import com.vaadin.ui.Window;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Locale;
@Component("cuba_RowLevelSecurityExceptionHandler")
public class RowLevelSecurityExceptionHandler implements GenericExceptionHandler {
/**
* Handles {@link com.haulmont.cuba.core.global.RowLevelSecurityException}.
*
*/
public class RowLevelSecurityExceptionHandler extends AbstractExceptionHandler {
private static final Logger log = LoggerFactory.getLogger(RowLevelSecurityExceptionHandler.class);
protected Window dialog;
protected Locale locale;
public RowLevelSecurityExceptionHandler() {
super(RowLevelSecurityException.class.getName());
Connection connection = App.getInstance().getConnection();
//noinspection ConstantConditions
locale = connection.getSession().getLocale();
}
private final Logger log = LoggerFactory.getLogger(RowLevelSecurityExceptionHandler.class);
@Override
protected void doHandle(App app, String className, String message, @Nullable Throwable throwable) {
public boolean handle(Throwable exception, WindowManager windowManager) {
try {
// we may show two or more dialogs if user pressed F5 and we have no valid user session
// just remove previous dialog and show new
if (dialog != null) {
app.getAppUI().removeWindow(dialog);
}
Messages messages = AppBeans.get(Messages.NAME);
String userCaption = null;
String userMessage = null;
if (throwable != null) {
Throwable rootCause = ExceptionUtils.getRootCause(throwable);
if (exception != null) {
Throwable rootCause = ExceptionUtils.getRootCause(exception);
RowLevelSecurityException rowLevelSecurityException = null;
if (throwable instanceof RowLevelSecurityException) {
rowLevelSecurityException = (RowLevelSecurityException) throwable;
if (exception instanceof RowLevelSecurityException) {
rowLevelSecurityException = (RowLevelSecurityException) exception;
} else if (rootCause instanceof RowLevelSecurityException) {
rowLevelSecurityException = (RowLevelSecurityException) rootCause;
}
@ -84,7 +55,7 @@ public class RowLevelSecurityExceptionHandler extends AbstractExceptionHandler {
String entity = rowLevelSecurityException.getEntity();
String entityName = entity.split("\\$")[1];
MetaClass entityClass = AppBeans.get(Metadata.NAME, Metadata.class).getClassNN(entity);
String entityCaption = messages.getTools().getEntityCaption(entityClass, locale);
String entityCaption = messages.getTools().getEntityCaption(entityClass);
ConstraintOperationType operationType = rowLevelSecurityException.getOperationType();
if (operationType != null) {
@ -125,17 +96,13 @@ public class RowLevelSecurityExceptionHandler extends AbstractExceptionHandler {
if (StringUtils.isEmpty(userCaption)) {
userCaption = messages.getMainMessage("rowLevelSecurity.caption");
}
windowManager.showNotification(userCaption, userMessage, Frame.NotificationType.ERROR);
WebWindowManager wm = app.getWindowManager();
wm.showNotification(userCaption, userMessage, Frame.NotificationType.ERROR);
Collection<Window> windows = app.getAppUI().getWindows();
if (!windows.isEmpty()) {
dialog = Iterables.getLast(windows);
}
return true;
} catch (Throwable th) {
log.error("Unable to handle RowLevelSecurityException", throwable);
log.error("Unable to handle RowLevelSecurityException", exception);
log.error("Exception in RowLevelSecurityExceptionHandler", th);
return false;
}
}
}

5
modules/web/src/cuba-web-spring.xml
View File

@ -20,11 +20,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd">
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>
@ -113,7 +111,6 @@
<list>
<value>com.haulmont.cuba.web.exception.NoUserSessionHandler</value>
<value>com.haulmont.cuba.web.exception.InvalidValueExceptionHandler</value>
<value>com.haulmont.cuba.web.exception.RowLevelSecurityExceptionHandler</value>
</list>
</property>
</bean>