Merge remote-tracking branch 'OpenCPS/release-candidate-2.2' into rel…

…ease-candidate-2.2
VietOpenCPS · Jul 2, 2019 · 134c9d9 · 134c9d9
2 parents 864982c + cfc8a2d
commit 134c9d9
Show file tree

Hide file tree

Showing 6 changed files with 722 additions and 239 deletions.
diff --git a/...n-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml b/...n-config/backend-admin-config-service/src/main/resources/META-INF/portlet-model-hints.xml
@@ -26,9 +26,15 @@
 		<field name="sharing" type="int" />
 		<field name="reportName" type="String" />
 		<field name="reportCode" type="String" />
-		<field name="filterConfig" type="String" />
-		<field name="tableConfig" type="String" />
-		<field name="userConfig" type="String" />
+		<field name="filterConfig" type="String" >
+			<hint name="max-length">65535</hint>
+		</field>
+		<field name="tableConfig" type="String" >
+			<hint name="max-length">65535</hint>
+		</field>
+		<field name="userConfig" type="String" >
+			<hint name="max-length">1000</hint>
+		</field>
 		<field name="reportType" type="String" />
 	</model>
 </model-hints>
diff --git a/...les/backend-api-rest/src/main/java/org/opencps/api/controller/impl/SMSManagementImpl.java b/...les/backend-api-rest/src/main/java/org/opencps/api/controller/impl/SMSManagementImpl.java
@@ -146,7 +146,7 @@ public Response getZaloUIdByTelNo(
 
 		}
 		catch (Exception e) {
-
+			_log.debug(e);
 			return Response.status(500).entity(StringPool.BLANK).build();
 		}
 

diff --git a/modules/backend-auth/src/main/java/org/opencps/kernel/prop/PropKeys.java b/modules/backend-auth/src/main/java/org/opencps/kernel/prop/PropKeys.java
@@ -35,6 +35,8 @@ public class PropKeys {
 	public static final String PORTAL_DOMAIN = "portal.domain";
 
 	public static final String MAIL_ADMIN_SERVER = "admin.email.from.address";
+
+	public static final String NAME_ADMIN_SERVER = "admin.email.from.name";
 
 	public static final String PORTAL_DOCUMENT_EDITOR_PATH =
 		"portal.document.editor.path";

diff --git a/modules/backend-auth/src/main/java/org/opencps/kernel/prop/PropValues.java b/modules/backend-auth/src/main/java/org/opencps/kernel/prop/PropValues.java
@@ -41,6 +41,9 @@ public class PropValues {
 	public static final String MAIL_ADMIN_SERVER =
 			PropsUtil.get(PropKeys.MAIL_ADMIN_SERVER);
 
+	public static final String NAME_ADMIN_SERVER =
+			PropsUtil.get(PropKeys.NAME_ADMIN_SERVER);
+
 	public static final String PORTAL_DOMAIN =
 		PropsUtil.get(PropKeys.PORTAL_DOMAIN);
 

diff --git a/...communication-service/src/main/java/org/opencps/communication/utils/NotificationUtil.java b/...communication-service/src/main/java/org/opencps/communication/utils/NotificationUtil.java
@@ -159,7 +159,11 @@ public static MBMessageEntry createMBMessageEntry(
 				dataModel.setClassPK(queue.getClassPK());
 				dataModel.setCreateDate(queue.getCreateDate());
 				dataModel.setExpireDate(queue.getExpireDate());
-				dataModel.setFromUsername(queue.getFromUsername());
+				if (Validator.isNotNull(PropValues.NAME_ADMIN_SERVER)) {
+					dataModel.setFromUsername(PropValues.NAME_ADMIN_SERVER);
+				} else {
+					dataModel.setFromUsername(queue.getFromUsername());
+				}
 				dataModel.setGroupId(queue.getGroupId());
 				dataModel.setModifiedDate(queue.getModifiedDate());
 				dataModel.setNotificationType(queue.getNotificationType());