Author: tchemit Date: 2012-07-31 23:29:01 +0200 (Tue, 31 Jul 2012) New Revision: 3585 Url: http://chorem.org/repositories/revision/pollen/3585 Log: refs #718 (administrator can admin all polls from participated and invited poll table pages" Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-07-31 21:16:32 UTC (rev 3584) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-07-31 21:29:01 UTC (rev 3585) @@ -51,6 +51,12 @@ */ public class SecurityService extends PollenServiceSupport { + public boolean isPollAdmin(Poll poll, UserAccount pollenUserAccount) { + boolean result = pollenUserAccount != null && pollenUserAccount.isAdministrator() || + isPollCreator(poll, null, pollenUserAccount); + return result; + } + public boolean isPollCreator(Poll poll, String accountId, UserAccount pollenUserAccount) { @@ -227,6 +233,7 @@ return null; } + public String isCanAccessVote(Poll poll, String accountId, AccountIdRole accountIdRole) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-07-31 21:16:32 UTC (rev 3584) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-07-31 21:29:01 UTC (rev 3585) @@ -120,13 +120,9 @@ } else { result.add("noresult"); } -// if (poll.isPublicResults()) { -// -// // only if results are public -// result.add("result"); -// } - boolean canAdminResult = securityService.isPollCreator( - poll, null, getPollenUserAccount()); + + boolean canAdminResult = securityService.isPollAdmin( + poll, getPollenUserAccount()); if (canAdminResult) { result.add("summary"); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-07-31 21:16:32 UTC (rev 3584) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-07-31 21:29:01 UTC (rev 3585) @@ -124,10 +124,13 @@ // only if results are public result.add("result"); + } else { + result.add("noresult"); + } - boolean canAdminResult = securityService.isPollCreator( - poll, null, getPollenUserAccount()); + boolean canAdminResult = securityService.isPollAdmin( + poll, getPollenUserAccount()); if (canAdminResult) { result.add("summary"); }