fix doc links (#6852)

Hack23 · Dec 14, 2024 · 0f0b4d9 · 0f0b4d9
1 parent 09f7d5b
commit 0f0b4d9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/...23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java b/...23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java
@@ -20,6 +20,7 @@
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Locale;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
@@ -47,6 +48,9 @@ public final class PageItemPropertyClickListener extends AbstractPageItemRendere
 	/** The property. */
 	private final String property;
 
+	/** The lower case. */
+	private boolean lowerCase = false;
+
 	/**
 	 * Instantiates a new page item property click listener.
 	 *
@@ -60,10 +64,27 @@ public PageItemPropertyClickListener(final String page, final String property) {
 		this.property = property;
 	}
 
+	/**
+	 * Instantiates a new page item property click listener.
+	 *
+	 * @param page the page
+	 * @param property the property
+	 * @param lowerCase the lower case
+	 */
+	public PageItemPropertyClickListener(final String page, final String property, final boolean lowerCase) {
+		super(page);
+		this.property = property;
+		this.lowerCase = lowerCase;
+	}
+
 	@Override
 	protected String getPageId(final Serializable t) {
 		try {
-			return BeanUtils.getProperty(t, property);
+			if (lowerCase) {
+				return BeanUtils.getProperty(t, property).toLowerCase(Locale.ENGLISH);
+			} else {
+				return BeanUtils.getProperty(t, property);
+			}
 		} catch (IllegalAccessException | InvocationTargetException |
 	            NoSuchMethodException e) {
 			LOGGER.warn(LOG_MSG_PROBLEM_GETTING_PROPERTY_FROM_OBJECT_EXCEPTION,property,t,e);

diff --git a/...tion/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java b/...tion/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java
@@ -53,7 +53,7 @@ public final class CommitteeDocumentHistoryPageModContentFactoryImpl
 			"personReferenceId", "org", "docId", "label", "roleDescription" };
 
 	private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(
-			UserViews.DOCUMENT_VIEW_NAME, "docId");
+			UserViews.DOCUMENT_VIEW_NAME, "docId", true);
 
 	/**
 	 * Instantiates a new committee document history page mod content factory

diff --git a/.../application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java b/.../application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java
@@ -51,7 +51,7 @@ public final class DocumentsOverviewPageModContentFactoryImpl extends AbstractDo
 			"documentType", "docType", "debateName", "tempLabel", "numberValue", "systemDate", "kallId",
 			"documentFormat", "documentUrlText", "documentUrlHtml", "documentStatusUrlXml",
 			"committeeReportUrlXml" };
-	private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(UserViews.DOCUMENT_VIEW_NAME, "id");
+	private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(UserViews.DOCUMENT_VIEW_NAME, "id",true);
 
 	/** The paging util. */
 	@Autowired

diff --git a/.../application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java b/.../application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java
@@ -47,7 +47,7 @@ public final class PartyDocumentHistoryPageModContentFactoryImpl extends Abstrac
 	private static final String[] HIDE_COLUMNS = { "id", "partyShortCode", "personReferenceId",
 			"numberValue", "orderNumber", "tempLabel", "label", "docId", "roleDescription" };
 	private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(
-			UserViews.DOCUMENT_VIEW_NAME, "docId");
+			UserViews.DOCUMENT_VIEW_NAME, "docId", true);
 	private static final String MEMBER_DOCUMENT_HISTORY = "Member Document history";
 
 	/**

diff --git a/...on/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java b/...on/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java
@@ -49,7 +49,7 @@ public final class PoliticianDocumentHistoryPageModContentFactoryImpl
 	private static final String[] HIDE_COLUMNS = { "id", "partyShortCode", "personReferenceId",
 			"numberValue", "orderNumber", "tempLabel", "referenceName", "docId", "label", "roleDescription" };
 	private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(
-			UserViews.DOCUMENT_VIEW_NAME, "docId");
+			UserViews.DOCUMENT_VIEW_NAME, "docId", true);
 
 	/**
 	 * Instantiates a new politician document history page mod content factory