Author: michiel
Date: 2010-03-17 23:27:28 +0100 (Wed, 17 Mar 2010)
New Revision: 41484
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/jetty-env.xml
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/config/log/log4j.xml
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes-nested.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select-instant.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate.jspx
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
Log:
implemented 'select' button, and restored old functionality
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/jetty-env.xml
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/jetty-env.xml
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/jetty-env.xml
2010-03-17 22:27:28 UTC (rev 41484)
@@ -8,7 +8,6 @@
For 'rapid development' of used overlays, this can come in handy.
-->
- <!--
<Set name="baseResource">
<New class="org.mortbay.resource.ResourceCollection">
<Arg>
@@ -25,7 +24,6 @@
</New>
</Set>
- -->
<!--
<Item><SystemProperty name="jetty.home" default="."/>/webapps/foo</Item>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/config/log/log4j.xml
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/config/log/log4j.xml
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/config/log/log4j.xml
2010-03-17 22:27:28 UTC (rev 41484)
@@ -21,6 +21,10 @@
<level class="&mmlevel;" value ="service" />
</logger>
+ <logger name="org.mmbase.bridge.util.Queries" >
+ <level class="&mmlevel;" value ="debug" />
+ </logger>
+
<logger name="STDERR">
<level class="&mmlevel;" value ="fatal" />
</logger>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -236,7 +236,7 @@
</mm:link>
</li>
- <li>
+ <li class="done">
<mm:link page="relate.jspx" referids="${referids}">
<a href="${_}">Basic mm-sr:relate useage</a>
</mm:link>
@@ -247,14 +247,14 @@
</mm:link>
</li>
- <li>
+ <li class="done">
<mm:link page="relate-select.jspx" referids="${referids}">
<a href="${_}">Basic mm-sr:relate useage with preselect</a>
</mm:link>
</li>
- <li>
+ <li class="done">
<mm:link page="relate-select-instant.jspx" referids="${referids}">
- <a href="${_}">Basic mm-sr:relate useage with preselect and
withoug a submit button</a>
+ <a href="${_}">Basic mm-sr:relate useage with preselect and
without a submit button</a>
</mm:link>
</li>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes-nested.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes-nested.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/mmform-relatednodes-nested.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -30,7 +30,7 @@
idvar="rid"
type="news"
role="posrel"
- item="/news-item.jspx"
+ item="news-item.jspx"
delete="true"
search="true"
sortable="true"
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -13,6 +13,7 @@
type="people"
role="related"
min="1"
+ max="1"
search="true"
fields="number,firstname">
<h4><span class="debug">${rid} </span>authors</h4>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select-instant.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select-instant.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select-instant.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -23,7 +23,7 @@
<mm:sortorder field="number" direction="down" />
<mm:constraint field="number" operator="IN" referid="related"
inverse="true" />
</mm:listnodescontainer>
- <mm-sr:relate
+ <mm-srt:relate
current="${current}" repository="${repository}"
maxpages="10"
pagesize="5"
@@ -33,7 +33,7 @@
extracreate="">
<jsp:attribute name="currentTitle"><b>News</b></jsp:attribute>
<jsp:attribute name="repositoryTitle"><b>Add other
news</b></jsp:attribute>
- </mm-sr:relate>
+ </mm-srt:relate>
</mm:node>
<mm:escape escape="links">$URL$</mm:escape>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate-select.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -10,7 +10,7 @@
<h2>mm-sr:relate with selection in the repository</h2>
<p>
- Make selections in the 'repository', then press the button to submit those
to 'current'
+ Make selections in the 'repository', then press the button to submit those
to 'current'
and vise versa.
</p>
@@ -26,18 +26,17 @@
<mm:sortorder field="number" direction="down" />
<mm:constraint field="number" operator="IN" referid="related"
inverse="true" />
</mm:listnodescontainer>
- <mm-sr:relate
+ <mm-srt:relate
current="${current}" repository="${repository}"
maxpages="10"
pagesize="5"
unrelate="true"
create="true"
select="true"
- submit="#save"
- extracreate="">
+ submit="#save">
<jsp:attribute name="currentTitle"><b>News</b></jsp:attribute>
<jsp:attribute name="repositoryTitle"><b>Add other
news</b></jsp:attribute>
- </mm-sr:relate>
+ </mm-srt:relate>
<input type="submit" value="Save" id="save" />
</mm:node>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate.jspx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate.jspx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/example-webapp/src/main/webapp/relate.jspx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -11,9 +11,9 @@
<h2>mm-sr:relate</h2>
<p>
The basic idea of mm-sr:relate is that 2 lists of nodes are presented. One
list is the 'current'
- list (e.g. all to a certain other related nodes of a certain type) and the
other is the
+ list (e.g. all to a certain other related nodes of a certain type) and the
other is the
'repository' (e.g. all nodes of a certain type). You edit the current list
by moving items from
- and to the repository.
+ and to the repository.
</p>
<p>
Make a selection in the 'current' or 'repository' list and press the
button to submit the changes
@@ -32,7 +32,7 @@
<mm:constraint field="number" operator="IN" referid="related"
inverse="true" />
</mm:listnodescontainer>
<form>
- <mm-sr:relate
+ <mm-srt:relate
current="${current}" repository="${repository}"
maxpages="10"
pagesize="5"
@@ -42,7 +42,7 @@
extracreate="">
<jsp:attribute name="currentTitle"><b>News</b></jsp:attribute>
<jsp:attribute name="repositoryTitle"><b>Add other
news</b></jsp:attribute>
- </mm-sr:relate>
+ </mm-srt:relate>
<input id="save" type="submit" value="Save" />
</form>
</mm:node>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
2010-03-17 22:27:03 UTC (rev 41483)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
2010-03-17 22:27:28 UTC (rev 41484)
@@ -2,6 +2,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
version="2.0"
>
<!--
@@ -178,6 +179,9 @@
</mm:include>
</div>
</c:if>
+ <c:if test="${select}">
+ <a href="#move" class="move"><mm-sr:button type="move" alt="move"
/></a>
+ </c:if>
<div class="mm_relate_repository searchable">
<jsp:invoke fragment="repositoryTitle" />
<c:choose>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
