Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1420 commits 40 branches 17 tags 11 MiB
Commit graph

288 commits

Author SHA1 Message Date
Martin Pépin
74135f8877 enhance User.__str__ with get_full_name 2017-05-23 16:50:43 +01:00
Martin Pépin
3c8f1c58c5 Use transaction.atomic instead of lock_table 
lock_table used LOCK which is mysql-specific
 2017-05-23 05:58:09 +01:00
Martin Pépin
f0f1585661 Registration: remove success var, fix message 
`member.profile` was not up-to-date where we used to send the success
message => move it to the place where the success var is set tu `True`
and remove the success var was which becomes irrelevant.
 2017-05-23 05:41:57 +01:00
Martin Pépin
dba8a0a857 Remove the num field in CofProfile 2017-05-22 01:00:32 +01:00
Martin Pépin
76dcaf7d51 drop py2 compat 2017-05-21 23:58:44 +01:00
Aurélien Delobelle
6ce2f178bf Fewer requests on petit cours details management. 2017-04-09 17:57:11 +02:00
Aurélien Delobelle
3dc91e30bd Fewer requests on petit cours list management. 2017-04-09 17:51:40 +02:00
Aurélien Delobelle
8870b5ace2 Fewer queries on poll view 2017-04-09 17:37:15 +02:00
Martin Pépin
a793e9a2e7 exclude empty strings from ldap results 
The uid attribute in a LDAP's entry cannot be an empty string. We need
to get an actual identifier.
 2017-04-01 22:07:32 +01:00
Martin Pépin
9cdf064005 Handle incomplete values from the LDAP 
Sometime `uid` is not set in the objects fetched from the LDAP. This
case has to be handled. Also, the `.uid` and `.cn` attributes of these
objects in the python abstractions have a `.value` method which we
should use.
 2017-04-01 21:45:05 +01:00
Martin Pépin
c95d7cb670 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-03-29 11:21:11 +01:00
Martin Pépin
579711ed2d Hotfix: typo in template name 2017-03-29 11:17:34 +01:00
Aurélien Delobelle
cb13280458 Merge branch 'master' into 'Aufinal/merge_k-fet' 
# Conflicts:
#   kfet/static/kfet/css/index.css
 2017-03-24 20:23:32 +01:00
Martin Pepin
33b3d558b5 Merge branch 'Aufinal/decorators' into 'master' 
Utilise les bons décorateurs

See merge request !195
 2017-03-21 00:25:50 +01:00
Ludovic Stephan
5e802217fd Remove lambda operators 2017-03-20 20:24:44 -03:00
Martin Pépin
59f57793ba typo 2017-03-20 22:05:48 +00:00
Martin Pépin
0aed975615 Fix the empty-query test in autocomplete 
If there is no valid word to search in the LDAP database, no query is
performed. Since 74f0b63e, that behaviour was broken because of a typo
 2017-03-20 08:14:20 +00:00
Ludovic Stephan
2c63e6b667 Use django.contrib.auth decorators 2017-03-20 00:11:50 -03:00
Martin Pépin
74f0b63e96 Change ldap query behaviour if multiple inputs 
It is now consistent with the other lookups over the User database
 2017-03-19 15:10:08 +00:00
Martin Pépin
dc50a23b10 Escape the content of the regex in highligh_text 2017-03-19 14:48:04 +00:00
Martin Pépin
4899bba1f7 Replace list comprehensions by iterators in dal 2017-03-19 14:05:25 +00:00
Martin Pépin
55b67f38c8 Notice the users about the α-numeric restriction 
Add a help text above the two autocompletion inputs letting the users
know that non-alphanumeric characters will not be used.
 2017-03-16 23:16:56 +00:00
Martin Pépin
741f0183e6 Prevent ldap injections in autocompletion views 
We only allow alphanumeric characters in the query in order to avoid
injections
 2017-03-16 22:43:43 +00:00
Ludovic Stephan
3793863bab Merge remote-tracking branch 'origin/k-fet' into Aufinal/merge_k-fet 2017-03-15 22:58:54 -03:00
Martin Pépin
84a39b41f2 Fix wrong email generation in _traitement_post (2) 
I forgot to fix an email in commit c51379447. Now there are all
well-formed
 2017-03-15 18:35:42 +00:00
Martin Pépin
c4edff717d Disable the fail_silently option for emails 
It is obviously a bad idea to fail silently if something go wrong
when the connection with the mail server is being established. This was
enabled in the `_traitement_post` method.
 2017-03-15 18:21:26 +00:00
Martin Pépin
c513794474 Fix wrong email generation in _traitement_post 
The list `proposed_mails` is a list of elements of the kind
`(User, (mail_object, mail_body))` but it was handled as if it were
`(User, mail_body)` in the function `_traitement_post`.
 2017-03-15 18:17:08 +00:00
Martin Pépin
98abe71681 Handle errors=None in _finalize_traitement 
Sometimes the `errors` variable is `None` in `_finalize_traitement`.
It was not an issue when it was just used in the templates but now we
have to handle this in the view. Basically, we shall consider it is an
empty list when it occurs.
 2017-03-15 11:59:41 +00:00
Martin Pépin
c37754376b Move registration_form to gestioncof/ 
The `registration` view was referencing this file using
`"gestioncof/registration_form.html"` whereas the `registration_post`
templated was referencing it in the global namespace
`"registration_form.html"`.

We choose the `gestioncof/` folder in order to avoid further conflicts
with other apps.
 2017-03-15 11:40:52 +00:00
Martin Pépin
266a789d97 Merge branch 'Kerl/messages' 
- Utilise une version à jour de jquery via un cdn
- Traite les messages
- Remplace les vieux simili-messages par des messages en utilisant le
  framework messages de Django
 2017-02-12 16:47:44 +01:00
Martin Pépin
313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet 2017-02-11 21:01:37 +01:00
Martin Pépin
70e89e3737 Merge branch 'master' into Kerl/messages 2017-02-11 20:55:17 +01:00
Qwann
ec7012ee47 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 16:22:09 +01:00
Qwann
924a289a78 cleaning UGLY django template style 
and moving some template files
 2017-02-11 16:21:13 +01:00
Martin Pépin
b4bf437447 Minor fixes 2017-02-11 16:15:17 +01:00
Martin Pépin
0e759405c7 Change the migration index 2017-02-11 15:13:29 +01:00
Martin Pépin
675ff99414 Supprime les doublons avec jquery 2017-02-11 11:50:49 +01:00
Martin Pépin
99a19f850a typo 2017-02-11 11:41:49 +01:00
Martin Pépin
71fb020e10 Merge branch 'master' into Kerl/messages 2017-02-11 11:40:47 +01:00
Martin Pépin
6e55905781 Merge branch 'master' into Kerl/use_django_custommail 2017-02-11 03:20:29 +01:00
Qwann
06eafdae47 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-02-11 02:54:54 +01:00
Qwann
ed01508481 using context_object_name and moving template 2017-02-11 02:51:43 +01:00
Martin Pépin
02a8e74e3b Optimize code, better queries 
- Remove useless Q queries
- Optimize with sets
- Queries over clipper id too
 2017-02-11 02:39:59 +01:00
Martin Pépin
d4b696db70 Merge branch 'master' into Kerl/ldap 2017-02-11 01:55:02 +01:00
Evarin
839d60e48f Support tactile jquery-ui 2017-02-11 00:11:14 +01:00
Evarin
80d8cb6b7e Mise à jour des dépendances jquery-ui et jquery 
Should fix #80 - à tester sur mobile (via dev.cof)
 2017-02-10 23:47:49 +01:00
Evarin
399e5ca16d Jolie mise en page pour les demandes de petit cours 
Closes #6
 2017-02-10 20:42:54 +01:00
Martin Pépin
8e7428a11e Répercute le déplacement du template dans les vues 2017-02-09 12:26:08 +01:00
Ludovic Stephan
ca73dc27bb move template 2017-02-08 21:13:02 -02:00
Ludovic Stephan
46638bd6d8 fixes #85 2017-02-08 21:08:00 -02:00