Author: bpoussin Date: 2011-04-06 18:43:43 +0200 (Wed, 06 Apr 2011) New Revision: 60 Url: http://chorem.org/repositories/revision/chorem/60 Log: renomage de state en status Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 16:41:56 UTC (rev 59) +++ trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-04-06 16:43:43 UTC (rev 60) @@ -76,7 +76,7 @@ protected int nbTouchForNext7DaysForMe = 0; /** nombre de projet en cours */ - protected List<FacetTopic> nbProjectOrderState = Collections.EMPTY_LIST; + protected List<FacetTopic> nbProjectOrderStatus = Collections.EMPTY_LIST; /** nombre de tache a faire ou finir */ protected int nbTaskOpen = 0; protected int nbTaskOpenForMe = 0; @@ -169,7 +169,7 @@ nbTouchForNext7DaysForMe = results[3].getTopicCount(Touch.FQ_FIELD_TOUCH_PARTICIPANT, userId); - nbProjectOrderState = results[4].getTopic(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS); + nbProjectOrderStatus = results[4].getTopic(ProjectOrder.FQ_FIELD_PROJECTORDER_STATUS); nbTaskOpen = results[5].getNumFound(); nbTaskOpenForMe = results[6].getNumFound(); @@ -224,8 +224,8 @@ return nbPerson; } - public List<FacetTopic> getNbProjectOrderState() { - return nbProjectOrderState; + public List<FacetTopic> getNbProjectOrderStatus() { + return nbProjectOrderStatus; } public int getNbTaskOpen() { Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-04-06 16:41:56 UTC (rev 59) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-04-06 16:43:43 UTC (rev 60) @@ -39,7 +39,7 @@ <div class="block"> <ul> - <li>Project open: <%=action.getNbProjectOrderOpen()%></li> + <li>Project status: <%=action.getNbProjectOrderStatus()%></li> <li>Task: <%=action.getNbTaskOpenForMe()%>/<%=action.getNbTaskOpen()%> </li>