christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug svn

Browse Source
This commit is contained in:
Nicolas Michard
2008-02-26 08:54:45 +00:00
parent 304937f955
commit 8fca4fcd0a
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
View File

@@ -17,6 +17,12 @@
</p> </p>
</c:if> </c:if>
<c:if test="${param['delete'] eq 'ko'}">
<p class="errorBox">
Your article cannot be deleted.<br/>
</p>
</c:if>
<c:choose> <c:choose>
<c:when test="${empty listArticle}"> <c:when test="${empty listArticle}">
<div class="warningBox"> <div class="warningBox">

1
YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
View File

@@ -124,6 +124,7 @@
<bean id="ArticleDeleteController" class="org.yacos.web.author.controller.ArticleDeleteController"> <bean id="ArticleDeleteController" class="org.yacos.web.author.controller.ArticleDeleteController">
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
<property name="userManager" ref="userManager" /> <property name="userManager" ref="userManager" />
<property name="messageManager" ref="messageManager" />
</bean> </bean>
<bean id="EvaluationRemoveController" class="org.yacos.web.PCmember.controller.EvaluationRemoveController"> <bean id="EvaluationRemoveController" class="org.yacos.web.PCmember.controller.EvaluationRemoveController">

16
YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
View File

@@ -9,9 +9,12 @@ import org.springframework.web.servlet.mvc.Controller;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;
import org.yacos.core.article.Article; import org.yacos.core.article.Article;
import org.yacos.core.article.IArticleManager; import org.yacos.core.article.IArticleManager;
import org.yacos.core.forum.IMessageManager;
import org.yacos.core.users.IUserManager; import org.yacos.core.users.IUserManager;
public class ArticleDeleteController implements Controller { public class ArticleDeleteController implements Controller {
private IMessageManager messageManager;
private IArticleManager articleManager; private IArticleManager articleManager;
public IArticleManager getArticleManager() { public IArticleManager getArticleManager() {
return articleManager; return articleManager;
@@ -38,14 +41,15 @@ public class ArticleDeleteController implements Controller {
Integer articleId = Integer.parseInt(request.getParameter("articleId")); Integer articleId = Integer.parseInt(request.getParameter("articleId"));
Article article = articleManager.getArticle(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){ if(article == null){
return new ModelAndView(new RedirectView("404error.htm")); return new ModelAndView(new RedirectView("404error.htm"));
} }
if(!articleManager.getPreferencesForArticle(articleId).isEmpty() 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")); return new ModelAndView(new RedirectView("manageArticle.htm?delete=ko"));
} }
articleManager.removeArticle(articleId); articleManager.removeArticle(articleId);
@@ -58,5 +62,13 @@ public class ArticleDeleteController implements Controller {
return new ModelAndView(new RedirectView("manageArticle.htm?delete=ok")); return new ModelAndView(new RedirectView("manageArticle.htm?delete=ok"));
} }
public IMessageManager getMessageManager() {
return messageManager;
}
public void setMessageManager(IMessageManager messageManager) {
this.messageManager = messageManager;
}
} }