Merge pull request #420 from lluismf/TRUNK-3744

TRUNK-4108:Unable to remove Global Properties from "Advanced Settings" page
openmrs · Oct 24, 2013 · 4f472b5 · 4f472b5
2 parents be4707b + 62c700d
commit 4f472b5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp b/webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
@@ -64,7 +64,7 @@
 							</c:otherwise>
 						</c:choose>
 					</td>
-					<td valign="top" rowspan="2"><input type="button" align="right" value='<openmrs:message code="general.remove" />' class="closeButton" onclick="edited(); remove(this)" /> </td> 
+					<td valign="top" rowspan="2"><input type="button" align="right" value='<openmrs:message code="general.remove" />' class="closeButton" onclick="edited(); removeProperty(this)" /> </td> 
 					<td id="message" valign="top" rowspan="2"></td>
 				</tr>
 				<tr class="${status.index % 2 == 0 ? 'evenRow' : 'oddRow' }">
@@ -78,7 +78,7 @@
 			<tr id="newProperty">
 				<td valign="top"><input type="text" name="property" size="50" maxlength="250" onkeyup="edited()" /></td>
 				<td valign="top"><input type="text" name="value" size="30" maxlength="250" onkeyup="edited()" /></td>
-				<td valign="top" rowspan="2"><input type="button" value='<openmrs:message code="general.remove" />' class="closeButton" onclick="remove(this)" /></td>
+				<td valign="top" rowspan="2"><input type="button" value='<openmrs:message code="general.remove" />' class="closeButton" onclick="removeProperty(this)" /></td>
 			</tr>
 			<tr id="newPropertyDescription">
 					<td colspan="2" valign="top" class="description">
@@ -118,7 +118,7 @@
 			}
 		}
 		
-		function remove(btn) {
+		function removeProperty(btn) {
 			if(btn.getAttribute("remove") == null){
 				var parent = btn.parentNode;
 				if(parent.tagName.toLowerCase() == "td"){