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

update for inclusion of custom form data property editing, still retaining default data property generator as default for data properties

Browse source
This commit is contained in:
hjkhjk54 2012-01-27 22:01:55 +00:00
parent 2282c56aaf
commit 5547acc85f
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
View file

@ -173,14 +173,22 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
//e.g. default add individual form etc. and additional scenarios //e.g. default add individual form etc. and additional scenarios
//TODO: Check if additional scenarios should be checked here //TODO: Check if additional scenarios should be checked here
private String processEditConfGeneratorName(VitroRequest vreq) { private String processEditConfGeneratorName(VitroRequest vreq) {
//use default object property form if nothing else works
String editConfGeneratorName = DEFAULT_OBJ_FORM;
//Handle deletion before any of the other cases //Handle deletion before any of the other cases
if(isDeleteForm(vreq)) { if(isDeleteForm(vreq)) {
return DEFAULT_DELETE_FORM; return DEFAULT_DELETE_FORM;
} }
//use default object property form if nothing else works
//or default data property form if the predicate in this case is data property
String editConfGeneratorName = DEFAULT_OBJ_FORM;
WebappDaoFactory wdf = vreq.getWebappDaoFactory();
String predicateUri = getPredicateUri(vreq);
Property prop = getPropertyByUri(predicateUri, wdf);
//If we want to have data property custom form, we need to consider that as well
if(isDataProperty( prop , wdf )){
editConfGeneratorName = DEFAULT_DATA_FORM;
}
// *** handle the case where the form is specified as a request parameter *** // *** handle the case where the form is specified as a request parameter ***
String formParam = getFormParam(vreq); String formParam = getFormParam(vreq);
if( formParam != null && !formParam.isEmpty() ){ if( formParam != null && !formParam.isEmpty() ){
@ -188,22 +196,16 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
return formParam; return formParam;
} }
String predicateUri = getPredicateUri(vreq);
if( isVitroLabel(predicateUri) ) { //in case of data property if( isVitroLabel(predicateUri) ) { //in case of data property
return RDFS_LABEL_FORM; return RDFS_LABEL_FORM;
} }
WebappDaoFactory wdf = vreq.getWebappDaoFactory(); //now if there is a custom form, for either data or object property, that form will be used
Property prop = getPropertyByUri(predicateUri, wdf); String customForm = prop.getCustomEntryForm();
//If we want to have data property custom form, we need to consider that as well if(customForm != null && !customForm.trim().isEmpty()) {
// if(isDataProperty( prop , wdf )){ editConfGeneratorName = customForm;
// editConfGeneratorName = DEFAULT_DATA_FORM; }
// } else{
String customForm = prop.getCustomEntryForm();
if(customForm != null && !customForm.trim().isEmpty()) {
editConfGeneratorName = customForm;
}
// }
log.debug("generator name is " + editConfGeneratorName); log.debug("generator name is " + editConfGeneratorName);
return editConfGeneratorName; return editConfGeneratorName;