OpenMRS

Timestamp:

07/16/08 12:29:31 (6 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

• openmrs/branches/1.3.x/src/web/org/openmrs/web/dwr/DWRRelationshipService.java (modified) (1 diff)

openmrs/branches/1.3.x/src/web/org/openmrs/web/dwr/DWRRelationshipService.java

@@ -46 +46 @@
-        
-        public Vector<RelationshipListItem> getRelationships(Integer personId, Integer relationshipTypeId) {
+                // hack to make sure other relationships aren't still hanging around
+                Context.clearSession();
+                
-                Vector<RelationshipListItem> ret = new Vector<RelationshipListItem>();
-                List<Relationship> rels = Context.getPersonService().getRelationships(Context.getPersonService().getPerson(personId));