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

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

Browse source
This commit is contained in:
Jon Corson-Rikert 2013-12-02 13:24:18 -05:00
commit 994684a29e
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ var adviseeRelUtils = {
// we don't want the user to see the label getting built, so hide the acSelector // we don't want the user to see the label getting built, so hide the acSelector
// field and display a bogus field that just has the last name in it. // field and display a bogus field that just has the last name in it.
this.fauxLabel.val(lastName); this.fauxLabel.val(lastName);
this.advisee.hide(); this.advisor.hide();
this.fauxLabel.show(); this.fauxLabel.show();
this.advisor.val(name); this.advisor.val(name);
this.lastName.val(lastName); this.lastName.val(lastName);

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

@ -11,7 +11,6 @@
<#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined"> <#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined">
<#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined"> <#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined">
<#assign predicateUri=editConfiguration.predicateUri!"undefined"> <#assign predicateUri=editConfiguration.predicateUri!"undefined">
<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!"">
<#if (editConfiguration.pageData.subjectName??) > <#if (editConfiguration.pageData.subjectName??) >
<h2><em>${editConfiguration.pageData.subjectName}</em></h2> <h2><em>${editConfiguration.pageData.subjectName}</em></h2>
@ -57,7 +56,7 @@
<#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel. <#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel.
These can just be ordinary links, rather than a v:input element, as in These can just be ordinary links, rather than a v:input element, as in
addAuthorsToInformationResource.jsp. --> addAuthorsToInformationResource.jsp. -->
<a href="${showAddFormUrl}<#if (domainUri?length > 0)>&domainUri=${domainUri}</#if>" id="showAddForm" class="button green" title="${i18n().add_new_web_page}">${i18n().add_new_web_page}</a> <a href="${showAddFormUrl}" id="showAddForm" class="button green" title="${i18n().add_new_web_page}">${i18n().add_new_web_page}</a>
<a href="${cancelUrl}" id="returnToIndividual" class="return" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a> <a href="${cancelUrl}" id="returnToIndividual" class="return" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
<img id="indicator" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" alt="${i18n().processing_indicator}"/> <img id="indicator" class="indicator hidden" src="${urls.base}/images/indicatorWhite.gif" alt="${i18n().processing_indicator}"/>

2
rdf/display/everytime/PropertyConfig.n3
View file

@ -1481,7 +1481,7 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "receipts" ; :displayName "receipts" ;
vitro:displayRankAnnot 3; vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .

9
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
View file

@ -61,11 +61,20 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
config.addFormSpecificData("baseEditWebpageUrl", path); config.addFormSpecificData("baseEditWebpageUrl", path);
//Also add domainUri and rangeUri if they exist, adding here instead of template
String domainUri = (String) vreq.getParameter("domainUri");
String rangeUri = (String) vreq.getParameter("rangeUri");
paramMap = new ParamMap(); paramMap = new ParamMap();
paramMap.put("subjectUri", config.getSubjectUri()); paramMap.put("subjectUri", config.getSubjectUri());
paramMap.put("predicateUri", config.getPredicateUri()); paramMap.put("predicateUri", config.getPredicateUri());
paramMap.put("editForm" , this.getEditForm() ); paramMap.put("editForm" , this.getEditForm() );
paramMap.put("cancelTo", "manage"); paramMap.put("cancelTo", "manage");
if(domainUri != null && !domainUri.isEmpty()) {
paramMap.put("domainUri", domainUri);
}
if(rangeUri != null && !rangeUri.isEmpty()) {
paramMap.put("rangeUri", rangeUri);
}
path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap); path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap);
config.addFormSpecificData("showAddFormUrl", path); config.addFormSpecificData("showAddFormUrl", path);

2
src/org/vivoweb/webapp/util/ModelUtils.java
View file

@ -103,6 +103,7 @@ public class ModelUtils {
List<String> properties = new ArrayList<String>(); List<String> properties = new ArrayList<String>();
properties.add(processPropertyURI); properties.add(processPropertyURI);
properties.add(nonProcessPropertyURI); properties.add(nonProcessPropertyURI);
properties.add(grantPropertyURI);
return properties; return properties;
} }
@ -110,6 +111,7 @@ public class ModelUtils {
List<String> properties = new ArrayList<String>(); List<String> properties = new ArrayList<String>();
properties.add(processPropertyInverseURI); properties.add(processPropertyInverseURI);
properties.add(nonProcessPropertyInverseURI); properties.add(nonProcessPropertyInverseURI);
properties.add(grantPropertyInverseURI);
return properties; return properties;
} }
} }