diff --git a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml index b0c4c59..9f0fd8f 100644 --- a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml +++ b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml @@ -121,6 +121,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem /listreport.htm=ROLE_USER /detailarticle.htm=ROLE_USER /admin.htm=ROLE_ADMIN + /forum.htm=ROLE_CHAIRMAN,ROLE_PCMEMBER /**=IS_AUTHENTICATED_ANONYMOUSLY diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp index e230877..8bbc8e3 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp @@ -9,17 +9,19 @@

Rating

-
+
- ${criterion.name} - + + ${criterion.name} + + - +
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp index a15049e..8642053 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp @@ -4,49 +4,29 @@ + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp index 38dde5c..a2ae9af 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp @@ -21,9 +21,9 @@
You have no article at the moment.
- You can submit an article in clicking + You can submit an article by clicking here - or using the item menu.
+ or using the menu item.
 @@ -36,21 +36,26 @@ - - - +
+
    -
  • Secondary Authors: +
  • +

    Secondary Authors:

    • ${sAuthor}
      •
    • -
  • Topic: ${article.topic}
    • +
  • +

    Topic:

    + ${article.topic} +
    • +
  • +

    Abstract :

    + ${article.abstractText} +
- ${article.abstractText} -
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp index 5029b24..67b593c 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp @@ -6,7 +6,7 @@

Validate an article

- Choose whether you want to validate an article (i.e. the article will take part in the conference) or reject it. + Choose whether you want to validate an article (i.e. the article will be featured in the conference) or reject it.

@@ -17,11 +17,27 @@ 		${article.mainAuthor.firstName} ${article.mainAuthor.lastName}
State: ${article.state} - "> - Validate - "> - Reject + + + " + onclick="return confirm('You are about to validate this article. This operation cannot be undone. Do you want to continue ?')"> + Validate + " + onclick="return confirm('You are about to reject this article. This operation cannot be undone. Do you want to continue ?')"> + Reject + + + + Rejected + + + Validated + + State: ${article.state} + + +
">Download listArticle = new ArrayList
(); String person = request.getParameter("role"); - - // TODO : renvoyer un truc s'il n'a pas le role + + if(person == null){ + throw new ModelAndViewDefiningException(new ModelAndView("404error")); + } if (person.equals("pcmember")) { if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, conf.getId())) { listArticle = articleManager.getArticlesOfMember(conf.getId(), SessionService.getInstance().getCurrentUserLogin()); @@ -67,7 +69,7 @@ public class ForumController extends SimpleFormController { } } else - throw new ModelAndViewDefiningException(new ModelAndView("404error")); + throw new ModelAndViewDefiningException(new ModelAndView("denied")); return new ModelAndView("forum", "listArticle", listArticle);