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

NIHVIVO-3957 fixes exceptions when attempting to edit or delete individuals using the backend editor

Browse source
This commit is contained in:
brianjlowe 2012-09-13 15:32:06 +00:00
parent 2c83351eb6
commit cf7f25af3b
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
View file

@ -25,6 +25,7 @@ import edu.cornell.mannlib.vedit.util.FormUtils;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
public class BaseEditController extends VitroHttpServlet { public class BaseEditController extends VitroHttpServlet {
@ -171,6 +172,20 @@ public class BaseEditController extends VitroHttpServlet {
return ontModel; return ontModel;
}
protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq) {
WebappDaoFactory wadf = (WebappDaoFactory) getServletContext().getAttribute(
"assertionsWebappDaoFactory");
if (wadf == null) {
log.info("Using vreq.getFullWebappDaoFactory()");
wadf = vreq.getFullWebappDaoFactory();
}
return wadf;
}
protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq, String userURI) {
return getWebappDaoFactory(vreq).getUserAwareDaoFactory(userURI);
} }
public String getDefaultLandingPage(HttpServletRequest request) { public String getDefaultLandingPage(HttpServletRequest request) {

9
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
View file

@ -77,15 +77,10 @@ public class EntityRetryController extends BaseEditController {
} else { } else {
action = epo.getAction(); action = epo.getAction();
} }
WebappDaoFactory wadf = vreq.getAssertionsWebappDaoFactory();
if (wadf == null) {
log.info("Using vreq.getFullWebappDaoFactory()");
vreq.getFullWebappDaoFactory();
}
LoginStatusBean loginBean = LoginStatusBean.getBean(request); LoginStatusBean loginBean = LoginStatusBean.getBean(request);
WebappDaoFactory myWebappDaoFactory = wadf.getUserAwareDaoFactory(loginBean.getUserURI()); WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(
vreq, loginBean.getUserURI());
IndividualDao ewDao = myWebappDaoFactory.getIndividualDao(); IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();
epo.setDataAccessObject(ewDao); epo.setDataAccessObject(ewDao);