X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/a0a15865970cfb25bae970fbb652b1de41c17304..daaa0de7fc21561fd324cbc93fc99d69646b537f:/poll.mlt

diff --git a/poll.mlt b/poll.mlt
index 735a201..200c96a 100644
--- a/poll.mlt
+++ b/poll.mlt
@@ -87,7 +87,7 @@ elseif $"cmd" = "add" then
 	elseif votes <= 0 then
 		%><h3>You must specify a positive number of votes per person.</h3><%
 	else
-		val id = Poll.addPoll (Init.getUserId(), title, $"descr", starts, ends, votes, official);
+		val id = Poll.addPoll (Init.getUserId(), title, $"descr", starts, ends, votes, official, false);
 		editingPoll := SOME id;
 		%><h3>Poll added!</h3><%
 	end
@@ -103,6 +103,7 @@ elseif $"mod" <> "" then
 <input type="hidden" name="id" value="<% $"mod" %>">
 <table class="blanks">
 <tr> <td>Title:</td> <td><input name="title" value="<% Web.html (#title poll) %>"></td> </tr>
+<tr> <td>Ready?</td> <td><input type="checkbox" name="ready" <% if #ready poll then " checked" else "" end %>></td> </tr>
 <tr> <td>Start date:</td> <td><input name="starts" value="<% Web.html (#starts poll) %>"></td> </tr>
 <tr> <td>End date:</td> <td><input name="ends" value="<% Web.html (#ends poll) %>"></td> </tr>
 <tr> <td>Max votes/person:</td> <td><input name="votes" value="<% #votes poll %>"></td> </tr>
@@ -122,7 +123,10 @@ elseif $"mod" <> "" then
 	val ends = $"ends";
 	val votes = Web.stoi ($"votes");
 	val official = $"official" = "on";
-	if title = "" then
+	val ready = $"ready" = "on";
+        if not (Poll.canModify poll) then
+		%><h3>You can't modify this poll anymore, because voting is already open.</h3><%
+	elseif title = "" then
 		%><h3>Your poll must have a title.</h3><%
 	elseif not pollAdmin and not (Poll.dateGeNow starts) then
 		%><h3>That start date is in the past!</h3><%
@@ -131,21 +135,22 @@ elseif $"mod" <> "" then
 	elseif votes <= 0 then
 		%><h3>You must specify a positive number of votes per person.</h3><%
 	else
-		Poll.modPoll {poll with title = title, descr = $"descr", starts = starts, ends = ends, votes = votes, official = official};
+		Poll.modPoll {poll with title = title, descr = $"descr", starts = starts, ends = ends, votes = votes, official = official,
+             		      ready = ready};
 		editingPoll := SOME (#id poll);
 		%><h3>Poll record saved.</h3><%
 	end
 
 elseif $"del" <> "" then
-	Group.requireGroupName "poll";
 	showNormal := false;
-	val poll = Poll.lookupPoll (Web.stoi ($"del")) %>
+	val poll = Poll.lookupPoll (Web.stoi ($"del"));
+	Poll.requireCanModify poll %>
 	<h3>Are you sure you want to delete poll <a href="poll?id=<% #id poll %>"><% Web.html (#title poll) %></a>?</h3>
 	<a href="poll?del2=<% $"del" %>">Yes, delete <% Web.html (#title poll) %>!</a>
 
 <% elseif $"del2" <> "" then
-	Group.requireGroupName "poll";
 	val poll = Poll.lookupPoll (Web.stoi ($"del2"));
+	Poll.requireCanModify poll;
 	Poll.deletePoll (Web.stoi ($"del2")) %>
 	<h3><% Web.html (#title poll) %> deleted!</h3>
 
@@ -153,7 +158,10 @@ elseif $"del" <> "" then
 	val id = Web.stoi ($"addChoice");
 	editingPoll := SOME id;
 	val descr = $"descr";
-	if descr = "" then
+	val poll = Poll.lookupPoll id;
+        if not (Poll.canModify poll) then
+		%><h3>You can't modify this poll anymore, because voting is already open.</h3><%
+	elseif descr = "" then
 		%><h3>Your poll choice must have a description.</h3><%
 	else
 		val id = Poll.addChoice (id, Web.stor ($"seq"), descr);
@@ -312,6 +320,8 @@ end %>
 
 <% if canModify then %>
 <br><hr><br>
+<h3><a href="?del=<% id %>">Delete this poll</a></h3>
+
 <h3>Add a new choice</h3>
 
 <form action="poll" method="post">