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

updates to remove debugging statements, etc.

Browse source
This commit is contained in:
hudajkhan 2013-08-13 15:26:57 -04:00
parent 6ea7d9ef37
commit 4b52ccd687
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- List of positions for the individual --> <h3>Positions!${core}personInPosition</h3> <#-- List of positions for the individual -->
<#assign positions = propertyGroups.pullProperty("${core}personInPosition")!> <#assign positions = propertyGroups.pullProperty("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = positions.localName> <#assign localName = positions.localName>

4
productMods/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
View file

@ -3,8 +3,6 @@
<#-- List of research areas for the individual --> <#-- List of research areas for the individual -->
<#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!> <#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!>
<#assign concepts = propertyGroups.pullProperty("${core}hasAssociatedConcept")!> <#assign concepts = propertyGroups.pullProperty("${core}hasAssociatedConcept")!>
<#if concepts?has_content> concepts has content <#else> concepts dont have content</#if>
<h2>RESEARCH AREAS: ${core}hasResearchArea</h2>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = researchAreas.localName> <#assign localName = researchAreas.localName>
<h2 id="${localName}" class="mainPropGroup"> <h2 id="${localName}" class="mainPropGroup">
@ -14,5 +12,5 @@
</h2> </h2>
<ul id="individual-${localName}" role="list" > <ul id="individual-${localName}" role="list" >
<@p.objectProperty researchAreas editable /> <@p.objectProperty researchAreas editable />
</ul> <#else> Research areas does not have content </ul>
</#if> </#if>

2
productMods/templates/freemarker/edit/forms/js/addConcept.js
View file

@ -281,7 +281,7 @@ var addConceptForm = {
generateIndividualLabelsDisplay:function(label, altLabels) { generateIndividualLabelsDisplay:function(label, altLabels) {
var labelDisplay = label; var labelDisplay = label;
if(altLabels != null && altLabels.length > 0) { if(altLabels != null && altLabels.length > 0) {
labelDisplay += "<br>(" + altLabels + ")"; labelDisplay += "<br> [" + altLabels + "]";
} }
return labelDisplay; return labelDisplay;
}, },

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
View file

@ -323,7 +323,8 @@ public class AddAssociatedConceptGenerator extends VivoBaseGenerator implements
private void addPreprocessors(EditConfigurationVTwo editConfiguration, WebappDaoFactory wadf) { private void addPreprocessors(EditConfigurationVTwo editConfiguration, WebappDaoFactory wadf) {
//An Edit submission preprocessor for enabling addition of multiple terms for a single search //An Edit submission preprocessor for enabling addition of multiple terms for a single search
//TODO: Check if this is the appropriate way of getting model
editConfiguration.addEditSubmissionPreprocessor( editConfiguration.addEditSubmissionPreprocessor(
new AddAssociatedConceptsPreprocessor(editConfiguration, wadf)); new AddAssociatedConceptsPreprocessor(editConfiguration, wadf));

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
View file

@ -377,7 +377,9 @@ public class AddAssociatedConceptsPreprocessor extends
//Check if system has an individual with this URI //Check if system has an individual with this URI
// //
List<Individual> individualsWithLabel = this.wadf.getIndividualDao().getIndividualsByDataProperty(RDFS.label.getURI(), label); List<Individual> individualsWithLabel = this.wadf.getIndividualDao().getIndividualsByDataProperty(RDFS.label.getURI(), label);
//We are only interested in concepts //We are only interested in semantic type objects and this may return multiple elements (perhaps too many?
//getting the model requires servlet and context and we don't want to pass that here do we//Return all semantic type objects with this label
//this.modelSelector.
return null; return null;
} }