diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
index d08310d..322a798 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
@@ -15,7 +15,13 @@
Your article has been successfully deleted.
-
+
+
+
+
+ Your article cannot be deleted.
+
+
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 602acd8..4839d8f 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -123,7 +123,8 @@
-
+
+
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
index 39532b9..d98289f 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
@@ -9,9 +9,12 @@ import org.springframework.web.servlet.mvc.Controller;
import org.springframework.web.servlet.view.RedirectView;
import org.yacos.core.article.Article;
import org.yacos.core.article.IArticleManager;
+import org.yacos.core.forum.IMessageManager;
import org.yacos.core.users.IUserManager;
public class ArticleDeleteController implements Controller {
+ private IMessageManager messageManager;
+
private IArticleManager articleManager;
public IArticleManager getArticleManager() {
return articleManager;
@@ -38,14 +41,15 @@ public class ArticleDeleteController implements Controller {
Integer articleId = Integer.parseInt(request.getParameter("articleId"));
Article article = articleManager.getArticle(articleId);
- // FIXME : vérifier si le gars a le droit de suppr ou pas
+ // FIXME : v�rifier si le gars a le droit de suppr ou pas
if(article == null){
return new ModelAndView(new RedirectView("404error.htm"));
}
if(!articleManager.getPreferencesForArticle(articleId).isEmpty()
- || !userManager.getPCMemberForArticle(articleId).isEmpty()){
+ || !userManager.getPCMemberForArticle(articleId).isEmpty()
+ || messageManager.getMessagesForArticle(articleId).isEmpty()){
return new ModelAndView(new RedirectView("manageArticle.htm?delete=ko"));
}
articleManager.removeArticle(articleId);
@@ -58,5 +62,13 @@ public class ArticleDeleteController implements Controller {
return new ModelAndView(new RedirectView("manageArticle.htm?delete=ok"));
}
+ public IMessageManager getMessageManager() {
+ return messageManager;
+ }
+
+ public void setMessageManager(IMessageManager messageManager) {
+ this.messageManager = messageManager;
+ }
+
}
\ No newline at end of file