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

NIHVIVO-2884 minor bug fix and improvement to manage Jena models page

Browse source
This commit is contained in:
brianjlowe 2011-07-13 14:29:13 +00:00
parent 8d6b6fad72
commit e5028dc668
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -141,6 +141,7 @@ public class JenaIngestController extends BaseEditController {
processCleanLiteralsRequest(vreq, maker, modelType); processCleanLiteralsRequest(vreq, maker, modelType);
} else if("outputModel".equals(actionStr)) { } else if("outputModel".equals(actionStr)) {
processOutputModelRequest(vreq, response, maker, modelType); processOutputModelRequest(vreq, response, maker, modelType);
return; // don't attempt to display a JSP
} else if("clearModel".equals(actionStr)) { } else if("clearModel".equals(actionStr)) {
processClearModelRequest(vreq, maker, modelType); processClearModelRequest(vreq, maker, modelType);
} else if("setWriteLayer".equals(actionStr)) { } else if("setWriteLayer".equals(actionStr)) {
@ -344,7 +345,6 @@ public class JenaIngestController extends BaseEditController {
} finally { } finally {
model.leaveCriticalSection(); model.leaveCriticalSection();
} }
return;
} }
private void processCleanLiteralsRequest(VitroRequest vreq, ModelMaker maker, String modelType) { private void processCleanLiteralsRequest(VitroRequest vreq, ModelMaker maker, String modelType) {

4
webapp/web/jenaIngest/listModels.jsp
View file

@ -103,7 +103,7 @@ function init(){
<input type="hidden" name="action" value="attachModel"/> <input type="hidden" name="action" value="attachModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/> <input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelType" value="${modelType}"/> <input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="attach to webapp"/> <input type="submit" name="submit" value="attach to TBox (ontology)"/>
</form> </form>
</td> </td>
<td> <td>
@ -111,7 +111,7 @@ function init(){
<input type="hidden" name="action" value="detachModel"/> <input type="hidden" name="action" value="detachModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/> <input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelType" value="${modelType}"/> <input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="detach from webapp"/> <input type="submit" name="submit" value="detach from TBox (ontology)"/>
</form> </form>
</td> </td>
<td> <td>