dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12620
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-14 09:42:20 +0700
message:
  Fixed bug - Don't hide the hidden fields in custom registration form.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java


--
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-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java	2013-10-09 11:26:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java	2013-10-14 02:42:20 +0000
@@ -61,9 +61,9 @@
 
     final Pattern SUGGESTED_VALUE_PATTERN = Pattern.compile( "suggested=('|\")(\\w*)('|\")" );
     
-    final Pattern CLASS_PATTERN = Pattern.compile( "class='(\\w*)'" );
+    final Pattern CLASS_PATTERN = Pattern.compile( "class=('|\")(\\w*)('|\")" );
     
-    final Pattern STYLE_PATTERN = Pattern.compile( "style=\"([\\w|\\d\\:\\;]+)\"" );
+    final Pattern STYLE_PATTERN = Pattern.compile( "style=('|\")([\\w|\\d\\:\\;]+)('|\")" );
 
     // --------------------------------------------------------------------------
     // ProgramDataEntryService

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-10-09 11:26:54 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-10-14 02:42:20 +0000
@@ -179,13 +179,13 @@
             Matcher classMarcher = CLASS_PATTERN.matcher( inputHtml );
             if ( classMarcher.find() )
             {
-                hidden = classMarcher.group( 1 );
+                hidden = classMarcher.group( 2 );
             }
 
             Matcher styleMarcher = STYLE_PATTERN.matcher( inputHtml );
             if ( styleMarcher.find() )
             {
-                style = styleMarcher.group( 1 );
+                style = styleMarcher.group( 2 );
             }
 
             if ( fixedAttrMatcher.find() && fixedAttrMatcher.groupCount() > 0 )