diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java index 17d7cf375..92e5cdd1d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java @@ -242,15 +242,17 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen Resource dg = qs.getResource("dataGetter"); Resource dgType = qs.getResource("dataGetterType"); String dgClassName = getClassName(dgType.getURI()); - + //literals in scope/on form and fields/ as well as + //json representation to be returned to template saved in json array processExistingDataGetter(counter, dg.getURI(), dgClassName, editConfig, queryModel, jsonArray); - addJSONArrayToFormSpecificData(jsonArray, editConfig); - //Get the util class for this type and add - //Values in scope/Literals and URIs on form/Fields on form that correspond + counter++; } + //add json array to form specific data to be returned + addJSONArrayToFormSpecificData(jsonArray, editConfig); + } catch(Exception ex) { log.error("Error occurred in executing query " + querystr, ex); diff --git a/webapp/web/WEB-INF/ontologies/app/menu.n3 b/webapp/web/WEB-INF/ontologies/app/menu.n3 index 027443dd5..673b967da 100644 --- a/webapp/web/WEB-INF/ontologies/app/menu.n3 +++ b/webapp/web/WEB-INF/ontologies/app/menu.n3 @@ -35,6 +35,13 @@ display:Home a . ########## Page Management ########## +display:pageListPage + a display:Page ; + display:title "Pages" ; + display:urlMapping "/pageList" ; + display:requiresBodyTemplate "pageList.ftl" ; + display:hasDataGetter display:pageListData . + display:pageListData a ; display:queryModel ; @@ -50,4 +57,5 @@ display:pageListData OPTIONAL{ ?pageUri display:title ?title. } OPTIONAL {?pageUri display:requiresBodyTemplate ?template .} OPTIONAL {?menuItem display:toPage ?pageUri .} - } """ . \ No newline at end of file + } """ . + \ No newline at end of file diff --git a/webapp/web/js/menupage/pageManagementUtils.js b/webapp/web/js/menupage/pageManagementUtils.js index cc005fdd2..0f2eeb2d8 100644 --- a/webapp/web/js/menupage/pageManagementUtils.js +++ b/webapp/web/js/menupage/pageManagementUtils.js @@ -18,12 +18,16 @@ var pageManagementUtils = { this.bindEventListeners(); this.initDisplay(); //if edit, then generate existing content - if(this.menuAction != null) { + if(this.menuAction != null && this.menuAction == "Edit") { this.initExistingContent(); } }, initExistingContent:function() { this.generateExistingContentSections(); + //display more content button - will need to review how to hit save etc. + //Don't need to display this b/c already in appended section + //pageManagementUtils.moreContentButton.show(); + //Need to have additional save button }, initReverseURIToLabel:function() { if(this.dataGetterLabelToURI != null) {