X-Git-Url: http://git.hcoop.net/hcoop/zz_old/portal.git/blobdiff_plain/453d75799fdab30af3360c84ee5dfd308aa1fb92..cc35c921e3d683b75018e3218648cccf23f0e247:/apps.mlt
diff --git a/apps.mlt b/apps.mlt
index adec3b6..af6e1bf 100644
--- a/apps.mlt
+++ b/apps.mlt
@@ -9,15 +9,15 @@ ref showNormal = true;
if $"vote" <> "" then
Group.requireGroupName "board";
App.vote (you, Web.stoi ($"vote"))
- %>
Vote registered
<%
+ %>Vote registered
<%
elseif $"unvote" <> "" then
Group.requireGroupName "board";
App.unvote (you, Web.stoi ($"unvote"))
- %>Unvote registered
<%
+ %>Unvote registered
<%
elseif $"deny" <> "" then
showNormal := false;
val appl = App.lookupApp (Web.stoi ($"deny"))
- %>Deny application for <% #name appl %>
+ %>Deny application for <% #name appl %>
+
+Abort adding this member
+
+<% elseif $"abort" <> "" then
+ App.abortAdd (Web.stoi ($"abort"))
+ %>Aborted
<%
+
end %>
<% if showNormal then %>
-Pending applications
+Pending applications
-<% foreach appl in App.listPending () do %>
+<% foreach appl in App.listApps App.PENDING do %>
-
- Received: | <% #applied appl %> |
- Approved by: | <%
+
+ Received: | <% #applied appl %> |
+ Approved by: | <%
ref first = true;
ref found = false;
- foreach (id, name) in App.votes (#id appl) do
+ val votes = App.votes (#id appl);
+ foreach (id, name) in votes do
if first then
first := false
else
@@ -72,16 +146,16 @@ end %>
%> [Unvote]<%
end
end %> <% if (iff board then not found else false) then %>[Vote]<% end %> |
- Username: | <% #name appl %> |
- Real name: | <% Web.html (#rname appl) %> |
- E-mail address: | <% #email appl %> |
- Forward e-mail? | <% if #forward appl then %>yes<% else %>no<% end %> |
- Proposed uses: | <% Web.htmlNl (#uses appl) %> |
- Other information: | <% Web.htmlNl (#other appl) %> |
+ Username: | <% #name appl %> |
+ Real name: | <% Web.html (#rname appl) %> |
+ E-mail address: | <% #email appl %> |
+ Forward e-mail? | <% if #forward appl then %>yes<% else %>no<% end %> |
+ Proposed uses: | <% Web.htmlNl (#uses appl) %> |
+ Other information: | <% Web.htmlNl (#other appl) %> |
<% if board then %>
- Add this member.
+ <% if length votes >= 2 then %>Approve this member. <% end %>
Deny this application.
<% end %>
<% end
|