Changeset 1763

Timestamp:

05/06/16 20:53:39 (8 years ago)

Author:

nanardon

Message:

Don't manage entrance anymore in expiration warning

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Maintenance.pm (modified) (1 diff)
• templates/mail/account_expire.mail (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm

@@ -42 +42 @@
     my $sth= $base->db->prepare(q{
         select name,
-            coalesce(endcircuit, expire) as appliedexpire,
+            expire as appliedexpire,
             endcircuit,
             expire
             from "user"
             where
-            coalesce(endcircuit, expire) < now() + ?::interval
-            and coalesce(endcircuit, expire) > now()
-            and coalesce(endcircuit, expire) is not null
+            expire < now() + ?::interval
+            and expire > now()
+            and expire is not null
             and exported = True
             order by expire

trunk/LATMOS-Accounts/templates/mail/account_expire.mail

@@ -7 +7 @@
 En aucun cas vos fichiers ne seront détruits. 
 
-[% IF endcircuit %]
-Il semble que vous n'avez pas fini votre circuit de sortie
-
-Merci de terminer celui-ci pour voir votre compte prolongé.
-[% ELSE %]
 Si ce dernier devait être prolongé, merci de dire à votre responsable
 de contacter svp@latmos.ipsl.fr afin de nous donner la nouvelle date.
-[% END %]
-
 
 Votre statut:
@@ -36 +29 @@
 In no case your files will be destroyed.
 
-[% IF endcircuit %]
-It seems you haven't finish your entrance circuit
-
-Thanks to finish it to have your account prolongated.
-[% ELSE %]
 If your account had to be extended, please ask your manager to contact
 svp@latmos.ipsl.fr to give us a new expiration date.
-[% END %]
-
 
 Your status: