|
|
@ -69,11 +69,7 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
|
|
|
|
{
|
|
|
|
{
|
|
|
|
super.initDocumentViewModel();
|
|
|
|
super.initDocumentViewModel();
|
|
|
|
seasons = seasonService.getAllSeasons();
|
|
|
|
seasons = seasonService.getAllSeasons();
|
|
|
|
|
|
|
|
selSeason = seasonService.getActive();
|
|
|
|
Map<String, String[]> map = Executions.getCurrent().getParameterMap();
|
|
|
|
|
|
|
|
if (map.get("select") == null) {
|
|
|
|
|
|
|
|
selSeason = seasonService.getActive();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
setHqlFilter();
|
|
|
|
setHqlFilter();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -328,9 +324,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (id > 0) {
|
|
|
|
if (id > 0) {
|
|
|
|
selSeason = null;
|
|
|
|
|
|
|
|
setHqlFilter();
|
|
|
|
|
|
|
|
dataList = getListFromService();
|
|
|
|
|
|
|
|
for (int i = 0; i < dataList.size(); i++) {
|
|
|
|
for (int i = 0; i < dataList.size(); i++) {
|
|
|
|
if (dataList.get(i).getId() == id) {
|
|
|
|
if (dataList.get(i).getId() == id) {
|
|
|
|
selIndex = i;
|
|
|
|
selIndex = i;
|
|
|
|