Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/PersonServiceImpl.java

    r4731 r4947  
    587587     */ 
    588588    public List<RelationshipType> getAllRelationshipTypes() throws APIException { 
    589             return getAllRelationshipTypes(true); 
    590     } 
    591  
    592         /** 
    593      * @see org.openmrs.api.PersonService#getAllRelationshipTypes(boolean) 
    594      */ 
    595     public List<RelationshipType> getAllRelationshipTypes(boolean includeRetired) 
    596             throws APIException { 
    597             return dao.getAllRelationshipTypes(includeRetired); 
     589            return dao.getAllRelationshipTypes(); 
    598590    } 
    599591 
    …… 
    802794                        else { 
    803795                                firstName = names[1]; 
    804                                 lastName = names[0]; 
     796                                lastName = names[2]; 
    805797                        } 
    806798                }