From 155cfe162a6acb587518e8766910be90f8252e1e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 3 Jul 2015 10:24:54 +0200
Subject: [PATCH] OO-1591: update to vitero 6.0
---
pom.xml | 2 +-
.../org/olat/modules/vitero/manager/ViteroManager.java | 7 ++++---
.../org/olat/modules/vitero/ui/_content/adminconfig.html | 8 ++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7262e2012d9..92ec53c70ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1712,7 +1712,7 @@
<dependency>
<groupId>org.openolat</groupId>
<artifactId>viterows</artifactId>
- <version>4.4</version>
+ <version>6.0</version>
</dependency>
<!-- docx4j need poi scratchpad version 3.8 -->
<dependency>
diff --git a/src/main/java/org/olat/modules/vitero/manager/ViteroManager.java b/src/main/java/org/olat/modules/vitero/manager/ViteroManager.java
index a7caaf968fe..5c4dfbbeaa2 100644
--- a/src/main/java/org/olat/modules/vitero/manager/ViteroManager.java
+++ b/src/main/java/org/olat/modules/vitero/manager/ViteroManager.java
@@ -94,7 +94,7 @@ import de.vitero.schema.booking.CreateBookingResponse;
import de.vitero.schema.booking.DeleteBookingRequest;
import de.vitero.schema.booking.DeleteBookingResponse;
import de.vitero.schema.booking.GetBookingListByDateRequest;
-import de.vitero.schema.booking.GetBookingListByUserInFutureRequest;
+import de.vitero.schema.booking.GetBookingListByUserAndCustomerInFutureRequest;
import de.vitero.schema.booking.Newbookingtype;
import de.vitero.schema.group.ChangeGroupRoleRequest;
import de.vitero.schema.group.Completegrouptype;
@@ -1226,11 +1226,12 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
protected List<Booking_Type> getBookingInFutureByUserId(int userId)
throws VmsNotAvailableException {
try {
- GetBookingListByUserInFutureRequest request = new GetBookingListByUserInFutureRequest();
+ GetBookingListByUserAndCustomerInFutureRequest request = new GetBookingListByUserAndCustomerInFutureRequest();
request.setUserid(userId);
+ request.setCustomerid(viteroModule.getCustomerId());
request.setTimezone(viteroModule.getTimeZoneId());
- Bookinglist bookingList = getBookingWebService().getBookingListByUserInFuture(request);
+ Bookinglist bookingList = getBookingWebService().getBookingListByUserAndCustomerInFuture(request);
return bookingList.getBooking();
} catch(SOAPFaultException f) {
diff --git a/src/main/java/org/olat/modules/vitero/ui/_content/adminconfig.html b/src/main/java/org/olat/modules/vitero/ui/_content/adminconfig.html
index 530369e35c1..4c2dbf936cf 100644
--- a/src/main/java/org/olat/modules/vitero/ui/_content/adminconfig.html
+++ b/src/main/java/org/olat/modules/vitero/ui/_content/adminconfig.html
@@ -1,7 +1,7 @@
<fieldset>
- <legend>$r.translate("vitero.title")</legend>
- $r.contextHelpWithWrapper("org.olat.modules.vitero.ui","module.html","help.hover.vitero")
- <p>$r.translate("vitero.intro")</p>
-
+ <legend>$r.translate("vitero.title")
+ $r.contextHelpWithWrapper("org.olat.modules.vitero.ui","module.html","help.hover.vitero")
+ </legend>
+ <p class="o_info">$r.translate("vitero.intro")</p>
$r.render("flc_module")
</fieldset>
\ No newline at end of file
--
GitLab