dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2661
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-01-20 13:23:12 +0700
message:
  Fixed bug <704942> Not Accepting HINDI characters for shortname in Dataset translation by deactivating the default regex in bean.xml core.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-01-11 17:04:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-01-20 06:23:12 +0000
@@ -523,7 +523,8 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="/^[\w]?[\w\d]*$/" />
+						<!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
+						<entry key="regex" value="''" />
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -619,7 +620,8 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="/^[\w]?[\w\d]*$/" />
+						<!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
+						<entry key="regex" value="''" />
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -803,7 +805,8 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="/^[\w]?[\w\d]*$/" />
+						<!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
+						<entry key="regex" value="''" />
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -907,7 +910,8 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="/^[\w]?[\w\d]*$/" />
+						<!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
+						<entry key="regex" value="''" />
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -1379,6 +1383,8 @@
 		class="org.hisp.dhis.dataelement.DataElementCategoryDeletionHandler">
 		<property name="categoryService" 
 			ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+		<!--property name="conceptService"
+			ref="org.hisp.dhis.concept.ConceptService" /-->
 	</bean>
 	
 	<bean id="org.hisp.dhis.dataelement.DataElementGroupSetDeletionHandler"