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

Mark Filter and User entities as restorable #PL-3201

Browse Source
This commit is contained in:
Yuriy Artamonov 2014-07-28 13:40:58 +00:00
parent ef8a009c75
commit 6f95937cdf
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/global/src/com/haulmont/cuba/security/entity/FilterEntity.java
View File

@ -7,6 +7,7 @@ package com.haulmont.cuba.security.entity;
import com.haulmont.cuba.core.entity.AbstractSearchFolder;
import com.haulmont.cuba.core.entity.StandardEntity;
import com.haulmont.chile.core.annotations.NamePattern;
import com.haulmont.cuba.core.entity.annotation.EnableRestore;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;
import javax.persistence.*;
@ -22,6 +23,7 @@ import javax.persistence.Entity;
@Table(name = "SEC_FILTER")
@NamePattern("%s|name")
@SystemLevel
@EnableRestore
public class FilterEntity extends StandardEntity {
@Column(name = "COMPONENT")
@ -123,4 +125,4 @@ public class FilterEntity extends StandardEntity {
public void setIsSet(Boolean isSet){
this.isSet=isSet;
}
}
}

6
modules/global/src/com/haulmont/cuba/security/entity/User.java
View File

@ -7,10 +7,7 @@ package com.haulmont.cuba.security.entity;
import com.haulmont.chile.core.annotations.Composition;
import com.haulmont.chile.core.annotations.NamePattern;
import com.haulmont.cuba.core.entity.StandardEntity;
import com.haulmont.cuba.core.entity.annotation.Listeners;
import com.haulmont.cuba.core.entity.annotation.OnDeleteInverse;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;
import com.haulmont.cuba.core.entity.annotation.TrackEditScreenHistory;
import com.haulmont.cuba.core.entity.annotation.*;
import com.haulmont.cuba.core.global.DeletePolicy;
import com.haulmont.cuba.core.sys.AppContext;
import org.apache.commons.lang.StringUtils;
@ -30,6 +27,7 @@ import java.util.List;
@Listeners("com.haulmont.cuba.security.listener.UserEntityListener")
@NamePattern("#getCaption|login,name")
@TrackEditScreenHistory
@EnableRestore
public class User extends StandardEntity {
private static final long serialVersionUID = 5007187642916030394L;

2
modules/global/src/com/haulmont/cuba/security/entity/messages.properties
View File

@ -101,3 +101,5 @@ EntityLogItem$Type.DELETE = Delete
EntityLogAttr=Entity Log Attribute
EntityLogAttr.name=Attribute
EntityLogAttr.value=New Value
FilterEntity = Filter

2
modules/global/src/com/haulmont/cuba/security/entity/messages_ru.properties
View File

@ -115,3 +115,5 @@ EntityLogItem$Type.DELETE = Удаление
EntityLogAttr=Атрибут журнала изменений сущностей
EntityLogAttr.name=Атрибут
EntityLogAttr.value=Новое значение
FilterEntity = Фильтр