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

Get rid of views for non-persistent entities. #PL-4147

Browse Source
This commit is contained in:
Konstantin Krivopustov 2014-07-28 11:30:12 +00:00
parent 4ea86790d0
commit 34b7c071cf
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/global/src/cuba-views.xml
View File

@ -194,14 +194,6 @@
<property name="whereClause"/>
</view>
<view class="com.haulmont.cuba.security.entity.UserSessionEntity" name="session.browse">
<property name="id"/>
<property name="login"/>
<property name="userName"/>
<property name="since"/>
<property name="lastUsedTs"/>
</view>
<view class="com.haulmont.cuba.security.entity.LoggedEntity"
name="loggedAttrs">
<property name="attributes" view="_local"/>

1
modules/gui/src/com/haulmont/cuba/gui/app/security/session/browse/session-browse.xml
View File

@ -11,7 +11,6 @@
<dsContext>
<groupDatasource id="sessionsDs" class="com.haulmont.cuba.security.entity.UserSessionEntity"
view="session.browse"
datasourceClass="com.haulmont.cuba.gui.app.security.session.browse.UserSessionsDatasource">
</groupDatasource>
</dsContext>

32
modules/gui/src/com/haulmont/cuba/gui/data/impl/PropertyDatasourceImpl.java
View File

@ -10,6 +10,7 @@ import com.haulmont.chile.core.model.MetaProperty;
import com.haulmont.chile.core.model.impl.AbstractInstance;
import com.haulmont.chile.core.model.utils.InstanceUtils;
import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.MetadataTools;
import com.haulmont.cuba.core.global.View;
import com.haulmont.cuba.core.global.ViewProperty;
import com.haulmont.cuba.gui.data.*;
@ -108,19 +109,24 @@ public class PropertyDatasourceImpl<T extends Entity>
@Override
public View getView() {
if (view == null) {
View masterView = masterDs.getView();
if (masterView == null)
throw new IllegalStateException("No view for datasource " + masterDs.getId());
ViewProperty property = masterView.getProperty(metaProperty.getName());
if (property == null)
return null;
if (property.getView() == null)
throw new IllegalStateException("Invalid view definition: " + masterView
+ ". Property '" + property + "' must have a view");
view = metadata.getViewRepository().findView(getMetaClass(), property.getView().getName());
//anonymous (nameless) view
if (view == null)
view = property.getView();
MetaClass metaMetaClass = masterDs.getMetaClass();
if (metadata.getTools().isPersistent(metaMetaClass)
|| metadata.getTools().isEmbeddable(metaMetaClass)) {
View masterView = masterDs.getView();
if (masterView == null)
throw new IllegalStateException("No view for datasource " + masterDs.getId());
ViewProperty property = masterView.getProperty(metaProperty.getName());
if (property == null)
return null;
if (property.getView() == null)
throw new IllegalStateException("Invalid view definition: " + masterView
+ ". Property '" + property + "' must have a view");
view = metadata.getViewRepository().findView(getMetaClass(), property.getView().getName());
//anonymous (nameless) view
if (view == null)
view = property.getView();
}
}
return view;
}