dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1937
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-06-01 11:26:52 +0700
message:
  Fix bug: Relationship-type validation error.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/AddRelationshipTypeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/UpdateRelationshipTypeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateRelationshipTypeAction.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-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm	2010-06-01 04:02:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addExtendedDataElementForm.vm	2010-06-01 04:26:52 +0000
@@ -251,7 +251,7 @@
 
 	var previousName = '';
 	
-	var startField = document.getElementById( 'dataDictionary' );
+	var startField = document.getElementById( 'name' );
 	startField.select();
 	startField.focus();
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/AddRelationshipTypeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/AddRelationshipTypeAction.java	2009-11-05 07:15:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/AddRelationshipTypeAction.java	2010-06-01 04:26:52 +0000
@@ -56,14 +56,14 @@
 
     private String aIsToB;
 
-    public void setaIsToB( String aIsToB )
+    public void setAIsToB( String aIsToB )
     {
         this.aIsToB = aIsToB;
     }
 
     private String bIsToA;
 
-    public void setbIsToA( String bIsToA )
+    public void setBIsToA( String bIsToA )
     {
         this.bIsToA = bIsToA;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/UpdateRelationshipTypeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/UpdateRelationshipTypeAction.java	2009-11-05 07:15:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/UpdateRelationshipTypeAction.java	2010-06-01 04:26:52 +0000
@@ -63,14 +63,14 @@
 
     private String aIsToB;
 
-    public void setaIsToB( String aIsToB )
+    public void setAIsToB( String aIsToB )
     {
         this.aIsToB = aIsToB;
     }
 
     private String bIsToA;
 
-    public void setbIsToA( String bIsToA )
+    public void setBIsToA( String bIsToA )
     {
         this.bIsToA = bIsToA;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateRelationshipTypeAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateRelationshipTypeAction.java	2010-06-01 04:05:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/relationship/ValidateRelationshipTypeAction.java	2010-06-01 04:26:52 +0000
@@ -59,16 +59,16 @@
 
     private String aIsToB;
 
-    public void setaIsToB( String aIsToB )
+    public void setAIsToB( String isToB )
     {
-        this.aIsToB = aIsToB;
+        aIsToB = isToB;
     }
 
     private String bIsToA;
 
-    public void setbIsToA( String bIsToA )
+    public void setBIsToA( String isToA )
     {
-        this.bIsToA = bIsToA;
+        bIsToA = isToA;
     }
 
     private String description;
@@ -99,7 +99,7 @@
     public String execute()
         throws Exception
     {
-
+        
         if ( aIsToB == null )
         {
             message = i18n.getString( "please_specify_the_a_side_of_the_relationship_type" );