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

VIVO-719 Improve the user interface

Browse source
This commit is contained in:
Jim Blake 2014-06-09 15:14:16 -04:00
parent be11b190bc
commit ae6a2a7251
5 changed files with 53 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
View file

@ -204,7 +204,6 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
urls.put("rdfData", UrlBuilder.getUrl("/uploadRDFForm"));
urls.put("rdfExport", UrlBuilder.getUrl("/export"));
urls.put("sparqlQueryBuilder", UrlBuilder.getUrl("/admin/sparqlquerybuilder"));
urls.put("dumpRestore", UrlBuilder.getUrl("/dumpRestore"));
}
if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) {
urls.put("sparqlQuery", UrlBuilder.getUrl("/admin/sparqlquery"));

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -65,6 +65,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelMakerID;
@ -180,6 +181,9 @@ public class JenaIngestController extends BaseEditController {
} else if("mergeResult".equals(actionStr)){
processMergeResultRequest(vreq, response);
return;
} else if ("dumpRestore".equals(actionStr)) {
processDumpRestore(vreq, response);
return;
}
else {
@ -1175,7 +1179,12 @@ public class JenaIngestController extends BaseEditController {
vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
}
private class CollationSort implements Comparator<String> {
private void processDumpRestore(VitroRequest vreq,
HttpServletResponse response) throws ServletException, IOException {
vreq.getRequestDispatcher("/dumpRestore").forward(vreq, response);
}
private class CollationSort implements Comparator<String> {
Collator collator;