litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-112

Browse source
This commit is contained in:
tworrall 2013-09-23 08:58:24 -04:00
parent 500bb456c3
commit f76ee886d5
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/individual/individual-menu.ftl
View file

@ -18,7 +18,7 @@
<#-- List the menu items --> <#-- List the menu items -->
<ul class="menuItems"> <ul class="menuItems">
<#list hasElement.statements as statement> <#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> </#list>
</ul> </ul>

5
webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
View file

@ -297,7 +297,6 @@ var customForm = {
//to the filtering list //to the filtering list
this.getAcFilterForIndividuals(); this.getAcFilterForIndividuals();
this.acCache = {}; this.acCache = {};
var theType = customForm.acTypes[$(selectedObj).attr('acGroupName')];
$(selectedObj).autocomplete({ $(selectedObj).autocomplete({
minLength: 3, minLength: 3,
@ -317,7 +316,7 @@ var customForm = {
dataType: 'json', dataType: 'json',
data: { data: {
term: request.term, term: request.term,
type: theType, type: customForm.acTypes[$(selectedObj).attr('acGroupName')],
multipleTypes:(customForm.acMultipleTypes == undefined || customForm.acMultipleTypes == null)? null: customForm.acMultipleTypes multipleTypes:(customForm.acMultipleTypes == undefined || customForm.acMultipleTypes == null)? null: customForm.acMultipleTypes
}, },
complete: function(xhr, status) { complete: function(xhr, status) {
@ -325,7 +324,7 @@ var customForm = {
var results = $.parseJSON(xhr.responseText); var results = $.parseJSON(xhr.responseText);
var filteredResults = customForm.filterAcResults(results); 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); filteredResults = customForm.removeConceptSubclasses(filteredResults);
} }