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
2017-03-20 08:14:20 +00: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
Martin Pépin
84a39b41f2
Fix wrong email generation in _traitement_post (2)
...
I forgot to fix an email in commit c51379447
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
Ludovic Stephan
8346dd65d1
dev data kfet
2017-02-07 23:22:31 -02:00
Martin Pépin
45eb384cfd
Use class-based views
...
See #94
2017-02-05 17:41:23 +01:00
Martin Pépin
9aa4782d57
Move petits-cours forms in another file
2017-02-05 17:10:51 +01:00
Martin Pépin
81681ad0e5
Turn 2 functions into class/objects methods
...
- `_get_attrib_counter` become a classmethod of
`PetitCoursAttributionCounter`
- `_get_demande_candidates` become a method of `PetitCoursDemande`
2017-02-05 17:07:58 +01:00
Martin Pépin
2bc5f3d646
Style and PEP8
...
- Drop `%` in favour of `.format` which has a better specification
- Remove a string concatenation
- Remove the trailing slashes according to the PEP8:
https://www.python.org/dev/peps/pep-0008/#maximum-line-length
NB. We let some which will disappear in the next commit.
- Remove an unused import and change the imports order
2017-02-05 13:49:01 +01:00
Martin Pépin
bb4e9dde4f
End of py2 support
2017-02-05 13:32:31 +01:00
Martin Pépin
13da42b823
typo
2017-02-03 23:41:33 +01:00
Martin Pépin
8c34e2f83f
proper use of messages in petits cours
2017-02-03 18:29:18 +01:00
Martin Pépin
fd42563f7f
Proper use of messages in calendar subscription
2017-02-03 18:29:18 +01:00
Martin Pépin
51c0e2dabc
proper use of messages in registration
2017-02-03 18:29:12 +01:00
Martin Pépin
b7ecac3db6
Proper use of messages in profile edit
2017-02-03 18:29:12 +01:00
Martin Pépin
1fe1b94afc
Proper use of messages in events
2017-02-03 18:29:12 +01:00
Martin Pépin
91fff8a11e
Proper use of messages in BdA inscription
2017-02-03 18:29:05 +01:00
Martin Pépin
0666b5288f
Proper use of messages in survies
2017-02-03 18:29:05 +01:00
Martin Pépin
d31b9f59ab
Traitement des messages
...
- Les messages sont affichés à l'utilisateurs dans les vues de GestioCOF
- On utilise une autre version de bootstrap et jquery (plus récent)
Fixes #48
2017-02-03 18:28:56 +01:00
Martin Pépin
ba88b94320
Fixes and cleanup
2017-02-03 17:07:50 +01:00
Martin Pépin
18b186929c
Dev data loaded using a django admin command
...
- Sites, surveys, events and petits cours demands/subjects are still
loaded from fixtures
- The users and their subscriptions to petits cours are loaded using the
`loaddevdata` command
- The sub command `loadbdadevdata` is called by `loaddevdata` and
populates the database with BdA related stuff :
- 2 tirages
- Show places
- Shows
- subscriptions
2017-02-03 14:33:10 +01:00
