SAK-25399 add property to enable/disable public polls. Off by default…

…. Patch from Erik L git-svn-id: https://source.sakaiproject.org/svn/polls/trunk@134302 66ffb92e-73f9-0310-93c1-f5514f145a0a
botimer · Feb 10, 2014 · 47f6873 · 47f6873
1 parent 6ca2cc9
commit 47f6873
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/polls/api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java b/polls/api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java
@@ -204,6 +204,13 @@ public interface ExternalLogic {
 	 */
 	public boolean isResultsChartEnabled();
 
+	/**
+	 * Are the public access options available to the Instructor?
+	 * poll.allow.public.access=true|false, default false
+	 * @return
+	 */
+	public boolean isShowPublicAccess();
+
 	/**
 	 * Is the current user using a mobile browser?
 	 * @return

diff --git a/polls/impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java b/polls/impl/src/java/org/sakaiproject/poll/logic/impl/ExternalLogicImpl.java
@@ -500,6 +500,9 @@ public boolean isResultsChartEnabled() {
 		return serverConfigurationService.getBoolean("poll.results.chart.enabled", false);
 	}
 
+	public boolean isShowPublicAccess() {
+		return serverConfigurationService.getBoolean("poll.allow.public.access", false);
+	}
 
 	public boolean isMobileBrowser() {
 		Session session = sessionManager.getCurrentSession();

diff --git a/polls/impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java b/polls/impl/src/test/org/sakaiproject/poll/logic/test/stubs/ExternalLogicStubb.java
@@ -187,6 +187,11 @@ public boolean isResultsChartEnabled() {
 		return false;
 	}
 
+	public boolean isShowPublicAccess() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 	public boolean isMobileBrowser() {
 		// TODO Auto-generated method stub
 		return false;

diff --git a/polls/tool/src/java/org/sakaiproject/poll/tool/producers/AddPollProducer.java b/polls/tool/src/java/org/sakaiproject/poll/tool/producers/AddPollProducer.java
@@ -262,10 +262,17 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams,
 		/*
 		 * access options
 		 */
-		UIMessage.make(newPoll,"poll_access_label","new_poll_access_label");
-		UIBoundBoolean.make(newPoll, "access-public", "poll.isPublic", poll.getIsPublic());
+		UIMessage pollAccessLabel = UIMessage.make(newPoll,"poll_access_label","new_poll_access_label");
+		UIBoundBoolean accessPublic = UIBoundBoolean.make(newPoll, "access-public", "poll.isPublic", poll.getIsPublic());
+		UIMessage newPollAccessPublicLabel = UIMessage.make(newPoll, "new_poll_access_public_label", "new_poll_access_public");
+
+		// SAK-25399: Do not display the public access by default
+		if(!externalLogic.isShowPublicAccess()) {
+			newPoll.remove(pollAccessLabel);		
+			newPoll.remove(accessPublic);
+			newPoll.remove(newPollAccessPublicLabel);
+		}
 
-
 		String[] minVotes = new String[]{"0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"};
 		String[] maxVotes = new String[]{"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15"};
 		UISelect min = UISelect.make(newPoll,"min-votes",minVotes,"#{poll.minOptions}",Integer.toString(poll.getMinOptions()));

diff --git a/polls/tool/src/webapp/templates/voteAdd.html b/polls/tool/src/webapp/templates/voteAdd.html
@@ -130,7 +130,7 @@ <h3 rsf:id="new_poll_title">Add/Edit a poll</h3>
 <p><strong rsf:id="poll_access_label">Access:</strong></p>
 <div>
 	<input type="checkbox" rsf:id="access-public" id="access-public" />
-	<label rsf:id="msg=new_poll_access_public" for="access-public">This poll is publically viewable</label>
+	<label rsf:id="new_poll_access_public_label" for="access-public">This poll is publically viewable</label>
 </div>
 
 <p><strong rsf:id="add_results_label">Release results: </strong><br />