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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-10-31 16:56:25 -04:00
commit 354fe56def
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -199,6 +199,7 @@
?infoResource core:relatedBy ?editorship . ?infoResource core:relatedBy ?editorship .
?editorship a core:Editorship . ?editorship a core:Editorship .
?editorship core:relates ?editorObj . ?editorship core:relates ?editorObj .
?editorObj a foaf:Person .
?editorObj rdfs:label ?editor ?editorObj rdfs:label ?editor
} UNION { } UNION {
?subject ?property ?authorship . ?subject ?property ?authorship .

3
productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
View file

@ -58,7 +58,8 @@
<p> <p>
<label for="orcidId">ORCID iD ${requiredHint}</label> <label for="orcidId">ORCID iD ${requiredHint}</label>
<input size="35" type="text" id="orcidId" name="orcidId" value="${orcidIdValue}" /> <input size="35" type="text" id="orcidIdDisplay" name="orcidIdDisplay" value="${orcidIdValue}" />
<input type="hidden" id="orcidId" name="orcidId" value="" />
</p> </p>
<input type="hidden" id="editKey" name="editKey" value="${editKey}"/> <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>

7
productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
View file

@ -12,6 +12,7 @@ var addOrcidIdToPersonUtils = {
this.form = $('#personHasOrcidId'); this.form = $('#personHasOrcidId');
this.orcidId = $('#orcidId'); this.orcidId = $('#orcidId');
this.orcidIdDisplay = $('#orcidIdDisplay');
}, },
@ -25,10 +26,10 @@ var addOrcidIdToPersonUtils = {
buildOrcidIdURL: function() { buildOrcidIdURL: function() {
var orcidBase = "http://www.orcid.org/"; var orcidBase = "http://orcid.org/";
var orcidIdVal = ""; var orcidIdVal = "";
if ( this.orcidId.val().length > 0 ) { if ( this.orcidIdDisplay.val().length > 0 ) {
orcidIdVal = orcidBase + this.orcidId.val(); orcidIdVal = orcidBase + this.orcidIdDisplay.val();
this.orcidId.val(orcidIdVal); this.orcidId.val(orcidIdVal);
} }
}, },