From f76ee886d539b291ec744d4e7e643f0dd2ab15d9 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 23 Sep 2013 08:58:24 -0400
Subject: [PATCH] VIVO-112

---
 .../templates/freemarker/body/individual/individual-menu.ftl | 2 +-
 .../freemarker/edit/forms/js/customFormWithAutocomplete.js   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
index 039e59d17..2099c0c96 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
@@ -18,7 +18,7 @@
     <#-- List the menu items -->
     <ul class="menuItems">
         <#list hasElement.statements as statement>
-            <li class="menuItem"><#include "${hasElement.template}"> <span class="controls"><!--p.editingLinks "hasElement" statement editable /--></span></li>
+            <li class="menuItem"><#include "${hasElement.template}"> <span class="controls"><!--p.editingLinks "hasElement" "" statement editable /--></span></li>
         </#list>
     </ul>
     
diff --git a/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js b/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
index 50a0322be..8ef3746b0 100644
--- a/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
+++ b/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
@@ -297,7 +297,6 @@ var customForm = {
         //to the filtering list
         this.getAcFilterForIndividuals();
         this.acCache = {};
-        var theType = customForm.acTypes[$(selectedObj).attr('acGroupName')];
         
         $(selectedObj).autocomplete({
             minLength: 3,
@@ -317,7 +316,7 @@ var customForm = {
                     dataType: 'json',
                     data: {
                         term: request.term,
-                        type: theType,
+                        type: customForm.acTypes[$(selectedObj).attr('acGroupName')],
                         multipleTypes:(customForm.acMultipleTypes == undefined || customForm.acMultipleTypes == null)? null: customForm.acMultipleTypes
                     },
                     complete: function(xhr, status) {
@@ -325,7 +324,7 @@ var customForm = {
                         var results = $.parseJSON(xhr.responseText);                        
                         var filteredResults = customForm.filterAcResults(results);
                         
-                        if ( theType == "http://www.w3.org/2004/02/skos/core#Concept" ) {
+                        if ( customForm.acTypes[$(selectedObj).attr('acGroupName')] == "http://www.w3.org/2004/02/skos/core#Concept" ) {
                             filteredResults = customForm.removeConceptSubclasses(filteredResults);
                         }