diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index ce8fc88..650441d 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -46,7 +46,7 @@
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
index e64021a..208bab7 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
@@ -52,17 +52,9 @@ public class EvaluationController extends SimpleFormController {
@Override
protected Object formBackingObject(HttpServletRequest request)
throws Exception {
- // FIXME mock object: criterionList en attendant criterionManager
+
Conference conf=SessionService.getInstance().getCurrentConference();
- ArrayList
criterionList = new ArrayList();
- Criterion c1=new Criterion("respect du theme",new Integer(1),new Integer(5),conf );
-
-
- Criterion c2=new Criterion("coherence",new Integer(1),new Integer(3),conf );
-
-
- criterionList.add(c1);
- criterionList.add(c2);
+ List criterionList = evaluationManager.getCriterions(conf.getId());
String id=request.getParameter("id");
Article art=articleManager.getArticle(Integer.parseInt(id));