Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Ralph Soika 2024-09-13 09:07:00 +02:00
parent 50e6daebff
commit abfb0704e0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/api/DataRestService.java
View file

@ -103,6 +103,7 @@ public class DataRestService {
String baseURI = servletRequest.getRequestURL().toString(); String baseURI = servletRequest.getRequestURL().toString();
baseURI = baseURI.substring(0, baseURI.indexOf("/data/report/" + name)); baseURI = baseURI.substring(0, baseURI.indexOf("/data/report/" + name));
baseURI = baseURI.replace("http://", "https://");
logger.info("Base URL=" + baseURI); logger.info("Base URL=" + baseURI);
Client client = createClient(baseURI, token); Client client = createClient(baseURI, token);
@ -155,12 +156,13 @@ public class DataRestService {
String url = client.getBaseURI() + "documents/"; String url = client.getBaseURI() + "documents/";
WebTarget target = rsClient.target(url); WebTarget target = rsClient.target(url);
Response response = target.request().get(); Response response = target.request().get();
if (response.getStatus() == 200) { if (response.getStatus() == 200 || response.getStatus() == 308) {
String result = response.readEntity(String.class); String result = response.readEntity(String.class);
if (result.contains("j_password")) { if (result.contains("j_password")) {
logger.info("Request failed - login failed"); logger.info("Request failed - login failed");
return null; return null;
} }
logger.info("login successful");
} else { } else {
logger.info("Request failed with status code: " + response.getStatus()); logger.info("Request failed with status code: " + response.getStatus());
return null; return null;

2
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_opliste_mahnlauf.xhtml
View file

@ -12,7 +12,7 @@
<h:panelGroup layout="block" styleClass="imixs-form-section" id="oplist-table" binding="#{opListContainer}"> <h:panelGroup layout="block" styleClass="imixs-form-section" id="oplist-table" binding="#{opListContainer}">
<h:selectOneRadio value="#{opListController.currencyFilter}" style="float:right;" rendered="#{!readonly}"> <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:selectItems value="#{aglConfigController.getSelectItems('currency.out')}" />
<f:ajax render="oplist-table" /> <f:ajax render="oplist-table" />
</h:selectOneRadio> </h:selectOneRadio>