Author: tchemit Date: 2014-05-04 23:57:18 +0200 (Sun, 04 May 2014) New Revision: 3907 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3907 Log: some dev fixes Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-04 21:39:22 UTC (rev 3906) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-04 21:57:18 UTC (rev 3907) @@ -81,6 +81,7 @@ getPollDao().update(poll); commit(); + //TODO Notify Choice added return result; @@ -100,6 +101,7 @@ getChoiceDao().update(choice); commit(); + //TODO Notify Choice edited return result; @@ -124,7 +126,7 @@ protected Choice getChoice(Poll poll, String choiceId) { - Choice result = poll.getChoiceByTopiaId(choiceId); + Choice result = getChoiceDao().findByTopiaId(choiceId); if (!poll.containsChoice(result)) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-04 21:39:22 UTC (rev 3906) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-04 21:57:18 UTC (rev 3907) @@ -53,8 +53,9 @@ public ImmutableSet<Poll> getPolls() { - checkIsConnected(); - checkIsAdmin(); + //TODO Push this back when security will be ok +// checkIsConnected(); +// checkIsAdmin(); List<Poll> polls = getPollDao().findAll(); return ImmutableSet.copyOf(polls); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java 2014-05-04 21:39:22 UTC (rev 3906) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java 2014-05-04 21:57:18 UTC (rev 3907) @@ -219,8 +219,7 @@ public void checkIsAdmin() { - //FIXME Reput this -// getSecurityService().checkIsAdmin(); + getSecurityService().checkIsAdmin(); }