Author: michiel
Date: 2010-07-05 18:55:49 +0200 (Mon, 05 Jul 2010)
New Revision: 42803
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/search.tagx
Log:
support for aliases attribute. Making more use of live events to make it easier
useable
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-07-05 16:55:21 UTC (rev 42802)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
2010-07-05 16:55:49 UTC (rev 42803)
@@ -56,6 +56,9 @@
<jsp:directive.attribute name="fields" type="java.lang.String"
description="Fields to show in both lists.
Searching still occurs with 'fieldlist type=search' " />
+ <jsp:directive.attribute name="aliases" type="java.lang.Boolean"
+ description="Whether to add columns with aliases" />
+
<jsp:directive.attribute name="styleClass"
description="Extra classes to be added to outer
div"/>
@@ -109,24 +112,10 @@
</c:if>
<jsp:directive.include file="/mmbase/searchrelate/settings.jspf" />
<script type="text/javascript">
- $(document).ready(function() {
<c:if test="${! empty submit}"><!-- submit attribute given: commit
search/relate on click of that element -->
- $("${submit}").click(function(el) {
- return $("#mm_related_${sid}")[0].relater.commit(el); });</c:if>
- $("#mm_related_${sid}").each(function() {
- if (this.relater != null) {
- <c:if test="${! empty fields}"> this.relater.setFields('${fields}');
</c:if>
- <c:if test="${! empty customizedir}">
this.relater.setCustomizedir('${customizedir}'); </c:if>
- <c:if test="${! empty pagesize}"> this.relater.setPageSize(${pagesize});
</c:if>
- <c:if test="${! empty maxpages}"> this.relater.setMaxPages(${maxpages});
</c:if>
- <c:if test="${! empty context}"> this.relater.setContext('${context}');
</c:if>
-
this.relater.setSessionName('${mm:property('org.mmbase.cloud.sessionname')}');
- <c:if test="${! empty current}">
- if (this.relater.current != null) {
this.relater.current.searcher.maxNumber = ${current.maxNumber}; }
+ $("${submit}").live("click", function(el) {
+ return $("#mm_related_${sid}")[0].relater.commit(el); });
</c:if>
- }
- })
- });
</script>
<fmt:bundle
@@ -134,9 +123,17 @@
basename="org.mmbase.searchrelate.resources.searchrelate">
<div id="mm_related_${sid}"
class="mm_related ${empty unrelate or ! unrelate ? '' :
'can_unrelate'} ${empty relations or ! relations ? '' : 'can_editrelations'}
${empty submit ? 'instant' : ''} ${select ? 'select' : '' } ${styleClass}">
- <c:if test="${! empty transaction}">
- <span class="transactionname" style="display:
none;">${transaction}</span>
- </c:if>
+ <div class="settings" style="display: none;">
+ <c:if test="${! empty transaction}"><span class="transactionname"
style="display: none;">${transaction}</span></c:if>
+ <c:if test="${! empty fields}"><span
class="fields">${fields}</span></c:if>
+ <c:if test="${! empty aliases}"><span
class="aliases">${aliases}</span></c:if>
+ <c:if test="${! empty customizedir}"><span
class="customizedir">${customizedir}</span></c:if>
+ <c:if test="${! empty pagesize}"><span
class="pagesize">${pagesize}</span></c:if>
+ <c:if test="${! empty maxpages}"><span
class="maxpages">${maxpages}</span></c:if>
+ <c:if test="${! empty context}"><span
class="context">${context}</span></c:if>
+ <c:if test="${! empty current}"><span
class="currentMaxNumber">${current.maxNumber}</span></c:if>
+ <span
class="sessionName">'${mm:property('org.mmbase.cloud.sessionname')}</span>
+ </div>
<c:if test="${! empty current}">
<div class="mm_relate_current searchable">
<jsp:invoke fragment="currentTitle" />
@@ -161,7 +158,7 @@
</mm:isgreaterthan>
</mm:size>
</mm:listnodescontainer>
- <mm:include page="/mmbase/searchrelate/page.jspx"
referids="customizedir?,fields?,relations?">
+ <mm:include page="/mmbase/searchrelate/page.jspx"
referids="customizedir?,fields?,aliases?,relations?">
<c:if test="${! empty pagesize}">
<mm:param name="pagesize" referid="pagesize" />
</c:if>
@@ -217,7 +214,7 @@
<c:choose>
<c:when test="${(empty implicitRepository and
settings['implicitRepository'] eq 'true') || implicitRepository}">
<mm:include page="/mmbase/searchrelate/page.jspx"
- referids="customizedir?,relations?,fields?">
+ referids="customizedir?,relations?,fields?,aliases?">
<c:if test="${! empty pagesize}">
<mm:param name="pagesize" referid="pagesize" />
</c:if>
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
2010-07-05 16:55:21 UTC (rev 42802)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
2010-07-05 16:55:49 UTC (rev 42803)
@@ -40,6 +40,11 @@
<jsp:directive.attribute name="pagesize"
type="java.lang.Integer"
description="Size of one page. Defaults to 10." />
+ <jsp:directive.attribute name="fields" type="java.lang.String"
+ description="Fields to show" />
+ <jsp:directive.attribute name="aliases"
type="java.lang.Boolean"
+ description="Whether to add a collumn with aliases"
/>
+
<mm:import id="_pagesize" vartype="integer">${empty pagesize ? 10 :
pagesize}</mm:import>
<mm:import externid="org.mmbase.in_form" id="in_form"
vartype="boolean">false</mm:import>
@@ -58,5 +63,7 @@
implicitRepository="${empty implicit ? settings['implicitRepository'] :
implicit}"
create="${create}"
styleClass="${styleClass}"
+ fields="${fields}"
+ aliases="${aliases}"
/>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
