Author: michiel
Date: 2010-07-06 17:17:39 +0200 (Tue, 06 Jul 2010)
New Revision: 42816
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/webapp/mmbase/searchrelate/Searcher.js.jsp
Log:
details
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-06 11:59:25 UTC (rev 42815)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relate.tagx
2010-07-06 15:17:39 UTC (rev 42816)
@@ -132,7 +132,11 @@
<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="repositoryManager">${repository.nodeManager.name}</span>
+ <c:if test="${! empty current}">
+ <span class="currentMaxNumber">${current.maxNumber}</span>
+ <span class="currentManager">${current.nodeManager.name}</span>
+ </c:if>
<span
class="sessionName">'${mm:property('org.mmbase.cloud.sessionname')}</span>
</div>
<c:if test="${! empty current}">
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Searcher.js.jsp
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Searcher.js.jsp
2010-07-06 11:59:25 UTC (rev 42815)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Searcher.js.jsp
2010-07-06 15:17:39 UTC (rev 42816)
@@ -148,6 +148,7 @@
if (maxNumber != null) {
this.current.searcher.maxNumber = maxNumber;
}
+ this.current.searcher.nodeManager = $(d).find("div.settings
span.currentManager").html();
} else {
this.logger.debug("No current rep found");
}
@@ -164,6 +165,7 @@
this.logger.debug("found " + this.repository + " in ");
if (this.repository != null) {
this.addSearcher(this.repository, "repository");
+ this.repository.searcher.nodeManager = $(d).find("div.settings
span.repositoryManager").html();
}
this.relateCallBack = null;
for (var i = 0; i < MMBaseRelater.readyFunctions.length; i++) {
@@ -788,6 +790,7 @@
}
this.logger.debug("found url to use: " + this.searchUrl);
this.maxNumber = -1;
+ this.nodeManager = "object";
}
@@ -1026,7 +1029,7 @@
MMBaseSearcher.prototype.getTr = function(node) {
var url = "${mm:link('/mmbase/searchrelate/node.tr.jspx')}";
- var params = {id: this.getQueryId(), node: node, fields: this.fields,
customizedir: this.customizedir, editrelations: this.canEditrelations};
+ var params = {id: this.getQueryId(), nodemanager: this.nodeManager, node:
node, fields: this.fields, customizedir: this.customizedir, editrelations:
this.canEditrelations};
var result;
$.ajax({async: false, url: url, type: "GET", dataType: "xml", data: params,
complete: function(res, status){
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
