From b197eec40f73a10b7798cda5106e79a1d42460d3 Mon Sep 17 00:00:00 2001 From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu> Date: Wed, 29 Aug 2018 13:26:02 +0200 Subject: [PATCH] Add web ui modul - first version --- .../eu/europa/ec/edelivery/smp/services/ServiceUIData.java | 2 +- .../database-scripts/mysql5innoDb-4.0.0-to-4.1.0.ddl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceUIData.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceUIData.java index 10fd1abd0..d3ba0074b 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceUIData.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceUIData.java @@ -99,7 +99,7 @@ public class ServiceUIData { ServiceResult<ServiceMetadataRO> sg = new ServiceResult<>(); sg.setPage(page); sg.setPageSize(pageSize); - long iCnt = uiDaoService.getDataListCount(DomainRO.class, null); + long iCnt = uiDaoService.getDataListCount(ServiceMetadataRO.class, null); sg.setCount(iCnt); if (iCnt > 0) { List<ServiceMetadataRO> lst = uiDaoService.getDataList(ServiceMetadataRO.class, page * pageSize, pageSize, sortField, sortOrder, null); diff --git a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innoDb-4.0.0-to-4.1.0.ddl b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innoDb-4.0.0-to-4.1.0.ddl index 2a1dbd415..318e1bdfd 100755 --- a/smp-webapp/src/main/smp-setup/database-scripts/mysql5innoDb-4.0.0-to-4.1.0.ddl +++ b/smp-webapp/src/main/smp-setup/database-scripts/mysql5innoDb-4.0.0-to-4.1.0.ddl @@ -1,4 +1,4 @@ --- Copyright 2018 European Commission | CEF eDelivery +x-- Copyright 2018 European Commission | CEF eDelivery -- -- Licensed under the EUPL, Version 1.2 -- @@ -116,6 +116,6 @@ CREATE TABLE hibernate_sequence( next_val BIGINT NOT NULL ); -INSERT INTO hibernate_sequence(next_val) values(1 +INSERT INTO hibernate_sequence(next_val) values(1); commit; -- GitLab