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

VIVO-694: resolved null pointer exception with web pages

Browse source
This commit is contained in:
Tim Worrall 2014-06-06 16:22:18 -04:00
parent 2cc05784c7
commit 9ef66e8764
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
View file

@ -48,6 +48,8 @@
</#if> </#if>
<form class="customForm" action ="${submitUrl}"> <form class="customForm" action ="${submitUrl}">
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}">
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}">
<label for="urlType">${i18n().url_type}${requiredHint}</label> <label for="urlType">${i18n().url_type}${requiredHint}</label>
<#assign urlTypeOpts = editConfiguration.pageData.urlType /> <#assign urlTypeOpts = editConfiguration.pageData.urlType />

2
productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
View file

@ -40,7 +40,7 @@
<#if webpage.typeLabel??>(<#if webpage.typeLabel == "URL">Standard Web Link<#else>${webpage.typeLabel}</#if></#if>) <#if webpage.typeLabel??>(<#if webpage.typeLabel == "URL">Standard Web Link<#else>${webpage.typeLabel}</#if></#if>)
</span> </span>
<span class="editingLinks"> <span class="editingLinks">
<a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> | <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}&rangeUri=${editConfiguration.rangeUri?url}&domainUri=${editConfiguration.domainUri?url}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> |
<a href="${urls.base}${deleteWebpageUrl}" class="remove" title="${i18n().delete_webpage_link}">${i18n().delete_button}</a> <a href="${urls.base}${deleteWebpageUrl}" class="remove" title="${i18n().delete_webpage_link}">${i18n().delete_button}</a>
</span> </span>
</li> </li>