From abfb0704e03ae3c5427f1e4de7e9532eee53e742 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Fri, 13 Sep 2024 09:07:00 +0200
Subject: [PATCH] minor fixes

---
 .../main/java/com/alexanderlogistics/api/DataRestService.java | 4 +++-
 .../workitems/forms/alexander/section_opliste_mahnlauf.xhtml  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java
index c28e7c3..5194d52 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java
@@ -103,6 +103,7 @@ public class DataRestService {
         String baseURI = servletRequest.getRequestURL().toString();
 
         baseURI = baseURI.substring(0, baseURI.indexOf("/data/report/" + name));
+        baseURI = baseURI.replace("http://", "https://");
         logger.info("Base URL=" + baseURI);
         Client client = createClient(baseURI, token);
 
@@ -155,12 +156,13 @@ public class DataRestService {
         String url = client.getBaseURI() + "documents/";
         WebTarget target = rsClient.target(url);
         Response response = target.request().get();
-        if (response.getStatus() == 200) {
+        if (response.getStatus() == 200 || response.getStatus() == 308) {
             String result = response.readEntity(String.class);
             if (result.contains("j_password")) {
                 logger.info("Request failed - login failed");
                 return null;
             }
+            logger.info("login successful");
         } else {
             logger.info("Request failed with status code: " + response.getStatus());
             return null;
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml
index 275f768..659a8ca 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml
@@ -12,7 +12,7 @@
 	<h:panelGroup layout="block" styleClass="imixs-form-section" id="oplist-table" binding="#{opListContainer}">
 
 		<h:selectOneRadio value="#{opListController.currencyFilter}" style="float:right;" rendered="#{!readonly}">
-			<f:selectItem itemLabel="#{message['form.all']}" itemValue="-" />
+			<f:selectItem itemLabel="#{custom['form.all']}" itemValue="-" />
 			<f:selectItems value="#{aglConfigController.getSelectItems('currency.out')}" />
 			<f:ajax render="oplist-table" />
 		</h:selectOneRadio>