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

Updates for page management

Browse source
This commit is contained in:
hjkhjk54 2012-06-04 21:36:04 +00:00
parent 918451f294
commit a31b91bddd
15 changed files with 292 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/js/menupage/pageManagementUtils.js
View file

@ -221,8 +221,8 @@ var pageManagementUtils = {
pageManagementUtils.createPageContentForSubmission();
//return true;
//For testing, not submitting anything
event.preventDefault();
return false;
//event.preventDefault();
return true;
} else{
$('#error-alert').removeClass('hidden');
@ -261,9 +261,9 @@ var pageManagementUtils = {
//Clone the object, renaming ids and copying text area values as well
$newContentObj = pageManagementUtils.createCloneObject(contentType, counter);
if ( contentType == "fixedHTML" || contentType == "sparqlQuery") {
varOrClass = $newContentObj.find('input#saveToVar').val();
}
if ( contentType == "sparqlQuery" || contentType == "fixedHtml") {
varOrClass = $newContentObj.find('input[name="saveToVar"]').val();
}
else if ( contentType == "browseClassGroup" ) {
$newContentObj.find('section#classesInSelectedGroup' + counter).removeClass('hidden');
varOrClass = $newContentObj.find('select#selectClassGroup' + counter + ' option:selected').text();

2
webapp/web/js/menupage/processClassGroupDataGetterContent.js
View file

@ -12,7 +12,7 @@ var processClassGroupDataGetterContent = {
processPageContentSection:function(pageContentSection) {
//Will look at classes etc.
var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
//query model should also be an input
//query model should also be an input, ensure class group URI is saved as URI and not string
var returnObject = {classGroup:classGroup, dataGetterClass:this.dataGetterClass};
return returnObject;
}

6
webapp/web/js/menupage/processFixedHTMLDataGetterContent.js
View file

@ -9,10 +9,10 @@ var processFixedHTMLDataGetterContent = {
},
//requires variable and text area
processPageContentSection:function(pageContentSection) {
var variableValue = pageContentSection.find("input[name='variable']").val();
var queryValue = pageContentSection.find("textarea[name='textArea']").val();
var saveToVarValue = pageContentSection.find("input[name='saveToVar']").val();
var htmlValue = pageContentSection.find("textarea[name='htmlValue']").val();
//query model should also be an input
var returnObject = {saveToVar:variableValue, query:queryValue, dataGetterClass:this.dataGetterClass, queryModel:"vitro:contextDisplayModel"};
var returnObject = {saveToVar:saveToVarValue, htmlValue:htmlValue, dataGetterClass:this.dataGetterClass};
return returnObject;
}

1
webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
View file

@ -12,6 +12,7 @@ var processIndividualsForClassesDataGetterContent = {
//Get classes selected
var classesSelected = [];
pageContentSection.find("input[name='classInClassGroup']:checked").each(function(){
//Need to make sure that the class is also saved as a URI
classesSelected.push($(this).val());
});
var returnObject = {classGroup:classGroup, classesSelectedInClassGroup:classesSelected, dataGetterClass:this.dataGetterClass};