updates for page management
This commit is contained in:
parent
9bf32fb36b
commit
7c0f00e7e9
6 changed files with 79 additions and 43 deletions
|
@ -316,9 +316,17 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
|
|||
if(pn.retrieveN3Optional(counter) != null) {
|
||||
n3.addAll(pn.retrieveN3Optional(counter));
|
||||
}
|
||||
//Add n3 connecting page to this data getter
|
||||
n3.add(getPageToDataGetterN3(pn, counter));
|
||||
editConfig.addN3Optional(n3);
|
||||
|
||||
}
|
||||
|
||||
private String getPageToDataGetterN3(ProcessDataGetterN3 pn, int counter) {
|
||||
String dataGetterVar = pn.getDataGetterVar(counter);
|
||||
//Put this method in the generator but can be put elsewhere
|
||||
return getDataGetterN3(dataGetterVar);
|
||||
}
|
||||
|
||||
private void addExistingLiteralsAndUrisOnForm(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn,
|
||||
int counter) {
|
||||
|
|
|
@ -97,13 +97,14 @@ public class ManagePagePreprocessor extends
|
|||
for(String literalName: literalKeys) {
|
||||
|
||||
//if submission already has value for this, then leave be
|
||||
//otherwise replace with blank value sentinel
|
||||
//otherwise replace with null which will not be valid N3
|
||||
//TODO: Replace with better solution for forcing literal deletion
|
||||
boolean haslv = submission.hasLiteralValue(literalName);
|
||||
if(!submission.hasLiteralValue(literalName)) {
|
||||
submission.addLiteralToForm(editConfiguration,
|
||||
editConfiguration.getField(literalName),
|
||||
literalName,
|
||||
(new String[] {EditConfigurationConstants.BLANK_SENTINEL}));
|
||||
(new String[] {null}));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -350,7 +350,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
|
|||
|
||||
//Get data servuice
|
||||
public String getDataServiceUrl() {
|
||||
return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClasses=1&vclassId=");
|
||||
return UrlBuilder.getUrl("/dataservice?getRenderedSolrIndividualsByVClass=1&vclassId=");
|
||||
}
|
||||
/**
|
||||
* For processig of JSONObject
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue