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/web/WEB-INF/tags/personField.tag

    r4732 r4947  
    88<%@ attribute name="linkUrl" required="false" %> 
    99<%@ attribute name="callback" required="false" %> 
     10<%@ attribute name="canAddNewPerson" required="false" %> 
    1011 
    1112<openmrs:htmlInclude file="/scripts/dojoConfig.js" /> 
    …… 
    3839                                                        relType = relType.substring(relPrefix.length); 
    3940                                                } 
    40                                                 ${callback}(relType, person.personId); 
     41                                                ${callback}(relType, person); 
    4142                                        </c:if> 
    4243                                } 
    …… 
    5859<div dojoType="PersonSearch" widgetId="${formFieldName}_search" personId="${initialValue}" roles="${roles}"></div> 
    5960<c:if test="${not empty searchLabelCode}"> 
    60         <div dojoType="OpenmrsPopup" widgetId="${formFieldName}_selection" hiddenInputName="${formFieldName}" searchWidget="${formFieldName}_search" searchTitle="<spring:message code="${searchLabelCode}" arguments="${searchLabelArguments}" />"></div> 
     61        <div dojoType="OpenmrsPopup" widgetId="${formFieldName}_selection" hiddenInputName="${formFieldName}" searchWidget="${formFieldName}_search" searchTitle="<spring:message code="${searchLabelCode}" arguments="${searchLabelArguments}" />" canAddNewPerson="${canAddNewPerson}"></div> 
    6162</c:if>  
    6263<c:if test="${empty searchLabelCode}"> 
    63         <div dojoType="OpenmrsPopup" widgetId="${formFieldName}_selection" hiddenInputName="${formFieldName}" searchWidget="${formFieldName}_search" searchTitle="${searchLabel}"></div> 
     64        <div dojoType="OpenmrsPopup" widgetId="${formFieldName}_selection" hiddenInputName="${formFieldName}" searchWidget="${formFieldName}_search" searchTitle="${searchLabel}" canAddNewPerson="${canAddNewPerson}" ></div> 
    6465</c:if>