From c94e9ddb457975f7933e1a4600eb37a22a70756b Mon Sep 17 00:00:00 2001 From: hjkhjk54 Date: Thu, 16 Aug 2012 21:18:10 +0000 Subject: [PATCH] updates for page management --- .../js/menupage/processInternalClassDataGetterContent.js | 9 ++++++++- .../utils/ProcessInternalClassDataGetterN3.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/productMods/js/menupage/processInternalClassDataGetterContent.js b/productMods/js/menupage/processInternalClassDataGetterContent.js index 699d7801..e52a75ca 100644 --- a/productMods/js/menupage/processInternalClassDataGetterContent.js +++ b/productMods/js/menupage/processInternalClassDataGetterContent.js @@ -52,10 +52,17 @@ var processInternalClassDataGetterContent = { pageContentSection.find("input[name='display-internalClass']").attr("checked", "checked"); } //Since this is populating content from the template, no need to "uncheck" anything - var results = pageContentSection.results; + var results = existingContentObject["results"]; if(results != null && results.classGroupName != null) { var displayInternalMessage = pageContentSection.find('label[for="display-internalClass"] em'); displayInternalMessage.filter(":first").html(results.classGroupName); + var resultsClasses = results["classes"]; + if(resultsClasses != null) { + var numberClasses = resultsClasses.length; + if(numberClasses != numberSelected) { + pageContentSection.find("input[name='allSelected']").removeAttr("checked"); + } + } } }, diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java index 57edd13e..97f6bea6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java @@ -192,7 +192,7 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas classGroupURI = classGroupResource.getURI(); } //individuals for classes - this may also be optional in case entire class group selected and internal class - if(qs.get("individualForClassResource") != null ) { + if(qs.get("individualForClass") != null ) { Resource individualForClassResource = qs.getResource("individualForClass"); individualsForClasses.add(individualForClassResource.getURI()); }