Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv6800/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
Tag: b1_4
channeldeletewarning.jsp channeldelete.jsp
Log Message:
CMSC-1068 If you delete a contentchannel, contentchannels below get lost in
the void
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1068
Index: channeldeletewarning.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/channeldeletewarning.jsp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- channeldeletewarning.jsp 8 May 2008 17:09:11 -0000 1.4.2.1
+++ channeldeletewarning.jsp 1 Oct 2008 11:04:39 -0000 1.4.2.2
@@ -62,6 +62,14 @@
</li>
</c:if>
</ul>
+
+ <br />
+ <mm:node number="$parentchannel">
+ <mm:countrelations role="childrel" searchdir="destination"
id="childrelSize" write="false"/>
+ <mm:compare referid="childrelSize" value="0"
inverse="true">
+ <fmt:message
key="channeldelete.warning.subchannels" />
+ </mm:compare>
+ </mm:node>
</p>
<p>
<fmt:message key="channeldelete.choice" />
Index: channeldelete.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/channeldelete.jsp,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -b -r1.3 -r1.3.4.1
--- channeldelete.jsp 21 May 2007 18:06:14 -0000 1.3
+++ channeldelete.jsp 1 Oct 2008 11:04:39 -0000 1.3.4.1
@@ -16,6 +16,12 @@
<fmt:message key="channeldelete.subtitle" />
<mm:node referid="number">
<b><mm:field name="name" /></b>
+
+ <br /><br />
+ <mm:countrelations role="childrel"
searchdir="destination" id="childrelSize" write="false"/>
+ <mm:compare referid="childrelSize" value="0"
inverse="true">
+ <fmt:message
key="channeldelete.warning.subchannels" />
+ </mm:compare>
</mm:node>
</p>
<p>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
