X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/746fe7b2ca1a08db9aca3c7d2e607ba58fdc4add..b6392a52a07ca163e5a1ee1b46d62a48ef395829:/apps.mlt
diff --git a/apps.mlt b/apps.mlt
index 00c2cfd..e3ac4b2 100644
--- a/apps.mlt
+++ b/apps.mlt
@@ -1,7 +1,7 @@
<% @header [("title", ["Membership applications"])];
val you = Init.getUserId ();
-val board = Group.inGroupName "board";
+val board = Group.reallyInGroupName "board";
val root = Group.inGroupNum 0;
ref showNormal = true;
@@ -13,7 +13,7 @@ if $"show" <> "" then
val appl = App.lookupApp (#app user) %>
- Received: | <% #applied appl %> |
+ Received: | <% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago) |
Approved by: | <%
ref first = true;
ref found = false;
@@ -32,6 +32,7 @@ if $"show" <> "" then
end %> <% if (iff board then not found else false) then %>[Vote]<% end %> |
Username: | <% #name appl %> |
Real name: | <% Web.html (#rname appl) %> |
+ E-mail: | <% #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) %> |
@@ -83,10 +84,10 @@ elseif $"cmd" = "approved" then
%>Pending applications
<%
- foreach appl in App.listApps App.ACCEPTED do %>
+ foreach appl in App.listApps [App.ACCEPTED, App.BEING_ADDED] do %>
- Received: | <% #applied appl %> |
+ Received: | <% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago) |
Approved by: | <%
ref first = true;
ref found = false;
@@ -110,6 +111,7 @@ elseif $"cmd" = "approved" then
|
Forward e-mail? | <% if #forward appl then %>yes<% else %>no<% end %> |
Proposed uses: | <% Web.htmlNl (#uses appl) %> |
Other information: | <% Web.htmlNl (#other appl) %> |
+ <% if #status appl = App.BEING_ADDED then %> WARNING: Someone already followed the add link for this application. Maybe he forgot to finish. |
<% end %>
<% if root then %>
@@ -121,10 +123,10 @@ elseif $"add" <> "" then
showNormal := false;
val id = Web.stoi ($"add");
val appl = App.lookupApp id;
- App.add id %>
+ App.preAdd id %>
First, run this on deleuze:
-magic-create-user-wrapper <% #name appl %> "<% #rname appl %>"<% if #forward appl then %> "<% #email appl %>"<% end %>
+new-user <% #name appl %> "<% #rname appl %>"<% if #forward appl then %> "<% #email appl %>"<% end %>