You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/13 15:09:22 UTC
svn commit: r555979 -
/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Author: andreas
Date: Fri Jul 13 06:09:21 2007
New Revision: 555979
URL: http://svn.apache.org/viewvc?view=rev&rev=555979
Log:
Check if live version exists before allowing to delete a language version. This fixes bug 42885.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java?view=diff&rev=555979&r1=555978&r2=555979
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/DeleteLanguage.java Fri Jul 13 06:09:21 2007
@@ -40,10 +40,16 @@
return;
}
- if (!getSourceDocument().getArea().equals(Publication.AUTHORING_AREA)) {
+ Document doc = getSourceDocument();
+
+ if (!doc.getArea().equals(Publication.AUTHORING_AREA)) {
addErrorMessage("This usecase can only be invoked in the authoring area!");
- } else if (getSourceDocument().getLanguages().length == 1) {
+ } else if (doc.getLanguages().length == 1) {
addErrorMessage("The last language version cannot be removed.");
+ }
+
+ if (doc.existsVersion(Publication.LIVE_AREA, doc.getLanguage())) {
+ addErrorMessage("The document can't be deleted if a live version exists.");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org