Merge pull request #1265 from khoahp/rc-1.8-issues-fix

Rc 1.8 issues fix
VietOpenCPS · Apr 4, 2017 · 30d4964 · 30d4964
2 parents af9914f + 2a6eee2
commit 30d4964
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/hooks/opencps-hook/docroot/WEB-INF/src/content/Language_vi.properties b/hooks/opencps-hook/docroot/WEB-INF/src/content/Language_vi.properties
@@ -1141,4 +1141,5 @@ system-cus = H\u1ec7 th\u1ed1ng \u0111ang x\u1eed l\u00fd
 error-cus = L\u1ed7i x\u1eed l\u00fd
 denied-cus = \u0110\u00e3 t\u1eeb ch\u1ed1i	
 canceled-cus = \u0110\u00e3 h\u1ee7y h\u1ed3 s\u01a1
-please-add-note-before-send = H\u00e3y nh\u1eadp \u00fd ki\u1ebfn tr\u01b0\u1edbc khi chuy\u1ec3n b\u01b0\u1edbc 
+please-add-note-before-send = H\u00e3y nh\u1eadp \u00fd ki\u1ebfn tr\u01b0\u1edbc khi chuy\u1ec3n b\u01b0\u1edbc 
+has-sign = K\u00fd s\u1ed1 
diff --git a/...ts/opencps-portlet/docroot/WEB-INF/src/org/opencps/statisticsmgt/util/StatisticsUtil.java b/...ts/opencps-portlet/docroot/WEB-INF/src/org/opencps/statisticsmgt/util/StatisticsUtil.java
@@ -987,7 +987,7 @@ public static JSONArray renderData(
 							groupId,
 							PortletPropsValues.DATAMGT_MASTERDATA_GOVERNMENT_AGENCY);
 				}
-				else if(filterKey.equals("domain")){
+				else if (filterKey.equals("domain")) {
 					dictCollection =
 						DictCollectionLocalServiceUtil.getDictCollection(
 							groupId,
@@ -1053,8 +1053,8 @@ else if(filterKey.equals("domain")){
 							int level = 0;
 
 							// Tham chieu den bang du lieu danh muc
-							
-							if(dictCollection != null){
+
+							if (dictCollection != null) {
 								dictItem =
 									DictItemLocalServiceUtil.getDictItemInuseByItemCode(
 										dictCollection.getDictCollectionId(),
@@ -1076,8 +1076,7 @@ else if(filterKey.equals("domain")){
 										StringPool.PERIOD);
 
 							}
-
-
+
 							// luu vao json
 							item.put("code", code);
 
@@ -1315,11 +1314,11 @@ else if(filterKey.equals("domain")){
 							item.put("keys", keys);
 
 							item.put("period-labels", periods);
-							
+
 							item.put("start-month", startMonth);
-							
+
 							item.put("start-year", startYear);
-							
+
 							item.put("period", period);
 
 						}
@@ -1363,8 +1362,8 @@ else if(filterKey.equals("domain")){
 	 */
 	public static JSONArray sortByCodes(JSONArray jsonArray, String[] codes) {
 
-		JSONArray temp = JSONFactoryUtil.createJSONArray();
 		if (codes != null && codes.length > 0 && jsonArray != null) {
+			JSONArray temp = JSONFactoryUtil.createJSONArray();
 			for (int c = 0; c < codes.length; c++) {
 				for (int j = 0; j < jsonArray.length(); j++) {
 					JSONObject object = jsonArray.getJSONObject(j);
@@ -1374,9 +1373,12 @@ public static JSONArray sortByCodes(JSONArray jsonArray, String[] codes) {
 					}
 				}
 			}
+			return temp;
+		}
+		else {
+			return jsonArray;
 		}
 
-		return temp;
 	}
 
 	/**