test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 19:57:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

@SystemLevel for Attributes. #PL-1433

Browse Source
This commit is contained in:
Konstantin Krivopustov 2013-03-18 15:30:15 +00:00
parent e7790c3f78
commit a6101b78ac
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/test/com/haulmont/cuba/core/MetadataTest.java
View File

@ -12,6 +12,7 @@ package com.haulmont.cuba.core;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.MetaModel;
import com.haulmont.chile.core.model.MetaProperty;
import com.haulmont.chile.core.model.Session;
import com.haulmont.chile.core.model.utils.PrintUtils;
import com.haulmont.cuba.core.entity.Folder;
@ -20,6 +21,7 @@ import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.MetadataTools;
import com.haulmont.cuba.security.entity.EntityLogItem;
import com.haulmont.cuba.security.entity.User;
import com.haulmont.cuba.security.entity.UserRole;
import com.haulmont.cuba.security.entity.UserSessionEntity;
import java.util.Collection;
@ -38,7 +40,6 @@ public class MetadataTest extends CubaTestCase
}
public void testPersistentAndTransientProperties() throws Exception {
Metadata metadata = AppBeans.get(Metadata.class);
MetadataTools tools = metadata.getTools();
// User
@ -62,4 +63,13 @@ public class MetadataTest extends CubaTestCase
metaClass = metadata.getSession().getClassNN(UserSessionEntity.class);
assertTrue(tools.isTransient(metaClass.getPropertyNN("login")));
}
public void testSystemLevel() throws Exception {
MetadataTools tools = metadata.getTools();
assertTrue(tools.isSystemLevel(metadata.getSession().getClassNN(UserRole.class)));
MetaClass metaClass = metadata.getSession().getClassNN(User.class);
assertTrue(tools.isSystemLevel(metaClass.getPropertyNN("password")));
}
}

2
modules/global/src/com/haulmont/chile/core/loader/ChileAnnotationsLoader.java
View File

@ -279,7 +279,7 @@ public class ChileAnnotationsLoader implements ClassMetadataLoader {
protected void onPropertyLoaded(MetaProperty metaProperty, Field field) {
SystemLevel systemLevel = field.getAnnotation(SystemLevel.class);
if (systemLevel != null) {
metaProperty.getAnnotations().put("system", true);
metaProperty.getAnnotations().put(SystemLevel.class.getName(), systemLevel.value());
}
}

19
modules/global/src/com/haulmont/cuba/core/global/MetadataTools.java
View File

@ -13,6 +13,7 @@ import com.haulmont.cuba.core.entity.BaseEntity;
import com.haulmont.cuba.core.entity.SoftDelete;
import com.haulmont.cuba.core.entity.Updatable;
import com.haulmont.cuba.core.entity.Versioned;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;
import org.apache.commons.lang.StringUtils;
import javax.annotation.ManagedBean;
@ -193,6 +194,24 @@ public class MetadataTools {
return metaProperty.getAnnotatedElement().isAnnotationPresent(Embedded.class);
}
/**
* Determine whether the given entity is marked as {@link SystemLevel}.
*/
public boolean isSystemLevel(MetaClass metaClass) {
Objects.requireNonNull(metaClass, "metaClass is null");
Boolean systemLevel = (Boolean) metaClass.getAnnotations().get(SystemLevel.class.getName());
return systemLevel == null ? false : systemLevel;
}
/**
* Determine whether the given property is marked as {@link SystemLevel}.
*/
public boolean isSystemLevel(MetaProperty metaProperty) {
Objects.requireNonNull(metaProperty, "metaProperty is null");
Boolean systemLevel = (Boolean) metaProperty.getAnnotations().get(SystemLevel.class.getName());
return systemLevel == null ? false : systemLevel;
}
/**
* Determine whether the given annotation is present in the object's class or in any of its superclasses.
* @param object entity instance

8
modules/gui/src/com/haulmont/cuba/gui/components/filter/addcondition/ModelPropertiesFilter.java
View File

@ -9,10 +9,10 @@ package com.haulmont.cuba.gui.components.filter.addcondition;
import com.haulmont.chile.core.model.MetaProperty;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.MetadataTools;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.security.entity.EntityAttrAccess;
import com.haulmont.cuba.security.global.UserSession;
import org.apache.commons.lang.BooleanUtils;
/**
* @author artamonov
@ -22,17 +22,19 @@ public class ModelPropertiesFilter {
private UserSession userSession;
private final MessageTools messageTools;
private final MetadataTools metadataTools;
public ModelPropertiesFilter() {
userSession = AppBeans.get(UserSessionSource.class).getUserSession();
messageTools = AppBeans.get(MessageTools.class);
metadataTools = AppBeans.get(MetadataTools.class);
}
public boolean isPropertyFilterAllowed(MetaProperty property) {
if (userSession.isEntityAttrPermitted(property.getDomain(), property.getName(), EntityAttrAccess.VIEW)) {
// exclude system level attributes
Boolean systemLevel = (Boolean) property.getAnnotations().get("system");
if (!BooleanUtils.isTrue(systemLevel)) {
Boolean systemLevel = metadataTools.isSystemLevel(property);
if (!systemLevel) {
// exclude not localized properties (they are usually not for end user) and ToMany
if (messageTools.hasPropertyCaption(property) && !property.getRange().getCardinality().isMany()) {
return true;