diff --git a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml index fcfd5b6..ed7047f 100644 --- a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml +++ b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml @@ -102,14 +102,14 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem PATTERN_TYPE_APACHE_ANT /secure/**=ROLE_ADMIN,ROLE_AUTHOR,ROLE_PCMEMBER /secure/**=IS_AUTHENTICATED_REMEMBERED - /listarticle.htm=ROLE_USER + /listarticle.htm=ROLE_CHAIRMAN /managearticle.htm=ROLE_USER /registeruser.htm=ROLE_ANONYMOUS,ROLE_USER /submissionarticle.htm=ROLE_USER /choosepreference.htm=ROLE_PCMEMBER /dispatcharticlelist.htm=ROLE_PCMEMBER /dispatcharticle.htm=ROLE_PCMEMBER - /addconference.htm=ROLE_CONFERENCE_CREATOR + /addconference.htm=ROLE_CHAIRMAN,ROLE_CONFERENCE_CREATOR /evaluation.htm=ROLE_PCMEMBER,ROLE_REFEREE /createreport.htm=ROLE_PCMEMBER,ROLE_REFEREE /listconference.htm=ROLE_USER diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 7a50df0..ac3e93d 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -63,6 +63,7 @@ user.information.followconference={0,choice, 0#You don''t have any conference | menu.chairman.title=Chairman menu.chairman.conference.create=Create new conference menu.chairman.conference.modify=Modify this conference +menu.chairman.article.list=Article's list menu.chairman.article.dispatch=Dispatch articles menu.chairman.article.validate=Validate articles menu.chairman.article.conflict=Manage the conflict list diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp index 14774b6..bc19191 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp @@ -8,7 +8,7 @@ diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 3f1fa13..462eab0 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -21,6 +21,7 @@
  • ">
  • ">
    • +
  • ">
  • ">
  • ">
  • ">
    • @@ -36,8 +37,7 @@ @@ -49,8 +49,7 @@ diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/about.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/about.jsp new file mode 100644 index 0000000..87963bc --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/about.jsp @@ -0,0 +1,26 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> + + + + + + + +

    :

    +
    +

    +

    +
    + +

    +

    + +

    +

    + +

    +

    + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp index fa3a4ed..c798df0 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp @@ -35,9 +35,10 @@ Authorized file types - Tex/Latec Word - OpenOffice + PDF + Tex/Latec + Word + OpenOffice diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp index ce14890..b4e8ee2 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp @@ -1,30 +1,33 @@ <%@ include file="/WEB-INF/decorators/include.jsp"%> - - -

    NO NAME

    + + + + +

    Article's list

    +

    ${article.title}

    -

    Author: ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}

    -

    +

    Author: ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}

    +

    + Secondary Authors:

    • ${sAuthor}
      •
    -

    Topic: ${article.topic}

    -

    - - ">Download the article + +

    Topic: ${article.topic}

    +

    State: ${article.state}

    +

    ">Download

    -
    -
    -
    -
    + +

    ">

    +     +     diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp index 8882646..10833c8 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/listReport.jsp @@ -6,6 +6,14 @@

    + + +
    + There is no report for this article at the moment. +
    +     + + @@ -36,7 +44,12 @@
    +     + +     + +
    +"> -">Home diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index 37770e7..e87d4a8 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -22,6 +22,7 @@ MainController + AboutController ListArticleController ManageArticleController SUserRegistrationController @@ -54,6 +55,9 @@ + + diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java index 0f9b812..3bad5f8 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java @@ -1,6 +1,7 @@ package org.yacos.web.PCmember.controller; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import javax.servlet.ServletException; @@ -28,15 +29,14 @@ public class ListArticleController extends SimpleFormController { logger.info("Returning listArticle view"); - List
    listArticle; + List
    listArticle = new ArrayList
    (); try { listArticle = articleManager.getArticles(SessionService.getInstance().getCurrentConferenceId()); - request.getSession().setAttribute("listArticle", listArticle); } catch (ConferenceDoesntExistException e) { logger.error(e.getMessage()); } - return new ModelAndView("listArticle"); + return new ModelAndView("listArticle", "listArticle", listArticle); } public IArticleManager getArticleManager() { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java index 1159ebb..54a43e3 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java @@ -49,6 +49,7 @@ public class ListReportController extends SimpleFormController { List ratings = evaluationManager.getRatingForReport(listReport.get(listReport.size() - 1).getId()); model.put("rtgs", ratings); + model.put("whereIcome", request.getHeader("REFERER")); return new ModelAndView("listReport", model); } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 3f29d97..54441c7 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -8,10 +8,8 @@ import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.mail.MailSendException; @@ -34,7 +32,6 @@ import org.yacos.web.chairman.form.FormConference; import org.yacos.web.chairman.validation.ConferenceValidator; import org.yacos.web.system.controller.MailSenderService; import org.yacos.web.system.session.SessionService; -import org.acegisecurity.annotation.Secured; public class AddConferenceController extends AbstractWizardFormController { @@ -243,8 +240,6 @@ public class AddConferenceController extends AbstractWizardFormController { setPages(new String[] {"addConference", "addConference2", "addConference3", "addConference4", "addConference5"}); } - // TODO : comment modifier la conf ? - @Secured({"ROLE_CONFERENCE_CREATOR"}) protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException { logger.info(this.getClass().toString() + " dans le formBackingObject"); @@ -252,9 +247,9 @@ public class AddConferenceController extends AbstractWizardFormController { String action = request.getParameter("action"); if (action == null || action.equals("")) - { - // TODO : tester ici si le gars a le droit d'�tre ici - // a-t-il le droit de cr�er une conf�rence ? + { + if (! conferenceManager.canCreateConference(SessionService.getInstance().getCurrentUserLogin())) + throw new ModelAndViewDefiningException(new ModelAndView("denied")); criteria = new HashSet(); criteriaAll = new HashSet(); @@ -502,6 +497,12 @@ public class AddConferenceController extends AbstractWizardFormController { conf.setDateEnd(conference.getDateEndParsed()); conf.setDateStart(conference.getDateStartParsed()); conf.setDateEvaluation(conference.getDateEvaluationParsed()); + conf.setPageNumber(conference.getPageNumberChecked()); + conf.setTypePDF(conference.isTypePDF()); + conf.setTypeLatec(conference.isTypeLatec()); + conf.setTypeWord(conference.isTypeWord()); + conf.setTypeODT(conference.isTypeODT()); + conf.setSendInfo(conference.getSendInfo()); conferenceManager.update(conf); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java index c547622..1a9d561 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java @@ -49,6 +49,7 @@ public class DispatchArticleController implements Controller{ this.conferenceManager = conferenceManager; } + // FIXME : c'est interdit de faire ca ;) Conference conf; public ModelAndView handleRequest(HttpServletRequest arg0, diff --git a/YACOSWeb/src/org/yacos/web/system/controller/AboutController.java b/YACOSWeb/src/org/yacos/web/system/controller/AboutController.java new file mode 100644 index 0000000..4c04694 --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/system/controller/AboutController.java @@ -0,0 +1,25 @@ +package org.yacos.web.system.controller; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; + +public class AboutController extends SimpleFormController { + + protected final Log logger = LogFactory.getLog(getClass()); + + public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + logger.info("Returning about view"); + + return new ModelAndView("about"); + } +} \ No newline at end of file