From 9cc2eceaf4b8f8dafcd42811d44ff74f4183149d Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 7 Jul 2010 17:32:12 +0000
Subject: [PATCH] NIHVIVO-725 Add VClassGroup type to SelectListGenerator in
 order to generate a select list of all classes belonging to publication
 classgroup for publication custom form.

---
 productMods/edit/forms/addPublicationToAuthor.jsp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/productMods/edit/forms/addPublicationToAuthor.jsp b/productMods/edit/forms/addPublicationToAuthor.jsp
index 17bef319..f83a8193 100644
--- a/productMods/edit/forms/addPublicationToAuthor.jsp
+++ b/productMods/edit/forms/addPublicationToAuthor.jsp
@@ -66,8 +66,8 @@ core:informationResourceInAuthorship (InformationResource : Authorship) - invers
     vreq.setAttribute("intDatatypeUri", intDatatypeUri);
     vreq.setAttribute("intDatatypeUriJson", MiscWebUtils.escape(intDatatypeUri));
 %>
-
-<c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
+<c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
+<c:set var="vivoCore" value="${vivoOnt}/core#" />
 <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
 <c:set var="label" value="${rdfs}label" />
 <c:set var="infoResourceClassUri" value="${vivoCore}InformationResource" />
@@ -112,8 +112,9 @@ SPARQL queries for existing values. --%>
     ?newPub core:informationResourceInAuthorship ?authorshipUri .               
 </v:jsonset>
 
-<v:jsonset var="infoResourceClassUriJson">${infoResourceClassUri}</v:jsonset>
-
+<%-- <v:jsonset var="infoResourceClassUriJson">${infoResourceClassUri}</v:jsonset> --%>
+<c:set var="publicationsClassGroupUri" value="${vivoOnt}#vitroClassGrouppublications" />
+<v:jsonset var="publicationsClassGroupUriJson">${publicationsClassGroupUri}</v:jsonset>
 
 <c:set var="editjson" scope="request">
 {
@@ -157,10 +158,10 @@ SPARQL queries for existing values. --%>
       "pubType" : {
          "newResource"      : "false",
          "validators"       : [ ],
-         "optionsType"      : "CHILD_VCLASSES",
+         "optionsType"      : "VCLASSGROUP",
          "literalOptions"   : [ "Select one" ],
          "predicateUri"     : "",
-         "objectClassUri"   : "${infoResourceClassUriJson}",
+         "objectClassUri"   : "${publicationsClassGroupUriJson}",
          "rangeDatatypeUri" : "",
          "rangeLang"        : "",
          "assertions"       : [ "${newPubTypeAssertion}" ]