Author: ymartel Date: 2012-05-15 18:28:13 +0200 (Tue, 15 May 2012) New Revision: 148 Url: http://chorem.org/repositories/revision/chorem/148 Log: fix multi-extension edit & display required extension with extension view Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-11 15:14:32 UTC (rev 147) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-15 16:28:13 UTC (rev 148) @@ -256,6 +256,7 @@ LinkedHashMultimap<String, Wikitty> map = LinkedHashMultimap.create(); for (WikittyQueryResult<Wikitty> result : results) { String ext = result.getQueryName(); + // This add the extension, even if it has no result map.put(ext, null); for (Wikitty w : result) { map.put(ext, w); @@ -274,10 +275,10 @@ if (extension == null) { exts.addAll(w.getExtensions()); } else { - for (String extName : extension) { - exts.addAll(w.getExtensionDependencies(extName, true)); - exts.add(w.getExtension(extName)); - } + // Display the extensions and required ones for them + List<String> extensionNames = Arrays.asList(extension); + List<WikittyExtension> wikittyExtensions = client.restoreExtensionAndDependenciesLastVesion(extensionNames); + exts.addAll(wikittyExtensions); } } @@ -315,7 +316,7 @@ return renderView("edit.jsp", "wikitty", w, "extensions", exts); } - public Render save(ChoremClient client, String id, String extension) { + public Render save(ChoremClient client, String id, String[] extension) { log.debug("save: " + id); Wikitty w = client.restore(id); if (w == null) { Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-05-11 15:14:32 UTC (rev 147) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-05-15 16:28:13 UTC (rev 148) @@ -11,7 +11,7 @@ </p> <c:forEach var="ext" items="${extensions}"> - <dl><dt><a href="<c:url value="/wikitty/search?query=extension=${ext.name}"/>">${ext.name}</a> + <dl><dt><a href="<c:url value="/wikitty/search?extension=${ext.name}"/>">${ext.name}</a> <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/edit/${wikitty.id}?extension=${ext.name}"/>"><i class="icon-pencil icon-white"></i> Edit</a> <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=${ext.name}&wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete</a></dt> <c:forEach var="fieldName" items="${ext.fieldNames}"> @@ -21,7 +21,7 @@ </c:forEach> <div class="container"> - <jsp:include page="/wikitty/search?query=${wikitty.id} AND id!=${wikitty.id}"/> + <jsp:include page="/wikitty/search?extension=${extensions}&query=${wikitty.id} AND id!=${wikitty.id}"/> <%-- <c:forEach var="ext" items="${extensions}"> <jsp:include page="footer${ext.name}.jsp"/>