Merge branch 'master' of https://git.bukova.info/repos/git/isspst
This commit is contained in:
@@ -216,7 +216,7 @@ public class ListViewModel<T extends DataModel> {
|
|||||||
if (editBean != null && !editBean.isValid()) {
|
if (editBean != null && !editBean.isValid()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (editBean.getCreated() == null) {
|
if (editBean != null && editBean.getCreated() == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!filter && newRec) {
|
if (!filter && newRec) {
|
||||||
@@ -228,7 +228,7 @@ public class ListViewModel<T extends DataModel> {
|
|||||||
fullList.add(editBean);
|
fullList.add(editBean);
|
||||||
}
|
}
|
||||||
dataBean = editBean;
|
dataBean = editBean;
|
||||||
if (!newRec) {
|
if (!newRec && editBean != null) {
|
||||||
dataList.set(selIndex, editBean);
|
dataList.set(selIndex, editBean);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user