Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv2033
Modified Files:
Searcher.js.jsp node.tr.jspx page.jspx
Log Message:
added a check if it is required to editrelations
See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates
Index: Searcher.js.jsp
===================================================================
RCS file: /var/cvs/applications/searchrelate/templates/Searcher.js.jsp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Searcher.js.jsp 27 Nov 2008 13:44:23 -0000 1.57
+++ Searcher.js.jsp 27 Nov 2008 16:03:02 -0000 1.58
@@ -19,7 +19,7 @@
* - mmsrCommitted (use $("div.mm_related").bind("mmsrCommitted",
function (e, submitter, status, relater) ) )
*
* @author Michiel Meeuwissen
- * @version $Id: Searcher.js.jsp,v 1.57 2008/11/27 13:44:23 andre Exp $
+ * @version $Id: Searcher.js.jsp,v 1.58 2008/11/27 16:03:02 andre Exp $
*/
@@ -63,6 +63,7 @@
this.logger.debug("setting up current");
this.current = $(d).find(".mm_relate_current")[0];
this.canUnrelate = $(d).hasClass("can_unrelate");
+ this.canEditrelations = $(d).hasClass("can_editrelations");
if (this.current != null) {
this.addSearcher(this.current, "current");
} else {
@@ -179,7 +180,7 @@
if (status == "success") {
//console.log("" + res);
$(a).addClass("succeeded");
- if (relatedNumbers != "") { // create tr's in which to
edit relations
+ if (self.canEditrelations && relatedNumbers != "") {
// create tr's in which to edit relations
var nrs = relatedNumbers.split(",");
$(nrs).each(function(i) {
var nr = this;
@@ -193,7 +194,7 @@
}
self.related = {};
self.unrelated = {};
- self.bindSaverelation(this.div);
+ if (self.canEditrelations)
self.bindSaverelation(this.div);
$(self.div).trigger("mmsrCommitted", [a, status,
self]);
return true;
} else {
@@ -227,6 +228,10 @@
complete: function(res, status){
if ( status == "success" || status == "notmodified" ) {
result = res.responseText;
+ } else {
+ var tr = $("<tr />");
+ tr.append('<td colspan="3" class="failed">Error: ' +
res.status + ' - ' + res.statusText + '</td>');
+ result = tr;
}
}
});
@@ -275,7 +280,7 @@
}
});
- self.bindSaverelation(rep);
+ if (self.canEditrelations) self.bindSaverelation(rep);
}
}
@@ -420,7 +425,7 @@
if ($(form).find('div.succeeded').length == 0) {
$(form).prepend('<div class="succeeded" />');
} else {
- $(form).find('div.succeeded').text(msg);
+ $(form).find('div.succeeded').show();
}
$(form).find('div.succeeded').text(msg);
$(form).find('div.succeeded').fadeOut(2000, function() {
Index: node.tr.jspx
===================================================================
RCS file: /var/cvs/applications/searchrelate/templates/node.tr.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- node.tr.jspx 19 Oct 2008 14:15:46 -0000 1.6
+++ node.tr.jspx 27 Nov 2008 16:03:02 -0000 1.7
@@ -10,6 +10,7 @@
<mm:import externid="id" required="true" from="request,parameters" />
<mm:import externid="node" required="true" from="request,parameters" />
<mm:import externid="fields" from="request,parameters" />
+ <mm:import externid="editrelations" from="request,parameters" />
<mm:import externid="customizedir" from="request,parameters" />
<mm:node referid="node">
<mm:nodeinfo type="nodemanager" id="nodemanager" write="false" />
@@ -30,7 +31,7 @@
</c:choose>
<td class="node action">
<mm:haspage page="${customizedir}action.td.jspx">
- <mm:include page="${customizedir}action.td.jspx" />
+ <mm:include page="${customizedir}action.td.jspx"
attributes="editrelations?" />
</mm:haspage>
</td>
</tr>
Index: page.jspx
===================================================================
RCS file: /var/cvs/applications/searchrelate/templates/page.jspx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- page.jspx 18 Nov 2008 15:51:17 -0000 1.28
+++ page.jspx 27 Nov 2008 16:03:02 -0000 1.29
@@ -9,7 +9,7 @@
Presents a table with one page of query results. Plus paging to other
pages (in tfoot).
Used in ajax-calls, but can also be directly included with mm:include
(for initial results).
@todo Searching only happens in actual mmbase queries now. How about
lucene queries?
- @version $Id: page.jspx,v 1.28 2008/11/18 15:51:17 andre Exp $
+ @version $Id: page.jspx,v 1.29 2008/11/27 16:03:02 andre Exp $
-->
<jsp:output omit-xml-declaration="true" />
<mm:import externid="id" required="true" />
@@ -21,7 +21,7 @@
<mm:import externid="maxpages">20</mm:import>
<mm:import externid="offset" vartype="integer">0</mm:import>
<mm:import externid="customizedir" />
- <mm:import externid="relations" />
+ <mm:import externid="relations" id="editrelations" />
<mm:import externid="fields" id="flds" />
<mm:listnodescontainer id="b" clone="query" jspvar="bq">
@@ -119,8 +119,8 @@
<!-- ACTUAL SEARCHRESULT -->
<tbody>
<mm:listnodes varStatus="status" jspvar="n">
- <mm:include page="node.tr.jspx" attributes="status,[EMAIL
PROTECTED],customizedir?,[EMAIL PROTECTED]" />
- <c:if test="${relations == true}">
+ <mm:include page="node.tr.jspx" attributes="status,[EMAIL
PROTECTED],customizedir?,[EMAIL PROTECTED],editrelations?" />
+ <c:if test="${editrelations == true}">
<mm:compare referid="id" regexp="\w*current">
<mm:include page="relations.tr.jspx" attributes="[EMAIL
PROTECTED],query,customizedir?,[EMAIL PROTECTED]" />
</mm:compare>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
