Merge branch 'master' into ATT-53

openmrs · Aug 19, 2024 · 619a734 · 619a734
2 parents cc857ee + 8ea5866
commit 619a734
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>attachments</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>attachments-api</artifactId>

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>attachments</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>attachments-omod</artifactId>

diff --git a/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentBytesResource.java b/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentBytesResource.java
@@ -3,6 +3,7 @@
 import static org.openmrs.module.attachments.AttachmentsContext.getContentFamily;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -23,6 +24,7 @@
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
 import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController;
 import org.openmrs.obs.ComplexData;
+import org.openmrs.web.WebUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -69,7 +71,12 @@ public void getFile(@PathVariable("uuid") String uuid, @RequestParam(required =
 		response.addHeader("File-Ext", getExtension(attComplexData.getTitle(), mimeType));
 
 		try {
-			response.getOutputStream().write(attComplexData.asByteArray());
+			byte[] bytes = attComplexData.asByteArray();
+			if (mimeType != null && mimeType.startsWith("text")) {
+				String byteString = WebUtil.encodeForHtmlContent(new String(bytes, StandardCharsets.UTF_8));
+				bytes = byteString.getBytes(StandardCharsets.UTF_8);
+			}
+			response.getOutputStream().write(bytes);
 		}
 		catch (IOException ex) {
 			response.setStatus(500);

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
@@ -22,13 +22,6 @@
 	<!-- Module Activator -->
 	<activator>${project.parent.groupId}.${project.parent.artifactId}.AttachmentsActivator</activator>
 
-
-	<!-- Adds link to admin page -->
-	<extension>
-		<point>org.openmrs.admin.list</point>
-		<class>${project.parent.groupId}.${project.parent.artifactId}.extension.html.AdminList</class>
-	</extension>
-
 	<!-- Internationalization -->
 	<!-- All message codes should start with ${project.parent.artifactId}. -->
 	<messages>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.openmrs.module</groupId>
   <artifactId>attachments</artifactId>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Attachments</name>
   <description>