Martin Pépin
213c11721e
Prevent petits cours demandes deletion
2017-02-23 11:03:28 +01:00
Martin Pépin
9f401b66e9
Specify the on_delete attribute everywhere
...
- Models
- Migrations
2017-02-23 01:40:25 +01:00
Martin Pépin
859f191894
Simpler admin interface
2017-02-18 19:06:43 +01:00
Martin Pépin
52bdd9824a
Merge branch 'supportBDS' of git.eleves.ens.fr:michele.orru/gestioCOF into michele
2017-02-18 13:00:21 +01:00
Martin Pépin
d7a13229ad
Fix CI config
...
- The setting file has moved to `gestioCOF/`
2017-02-13 13:41:34 +01:00
Martin Pépin
7f5132961f
Add the cof_members group
...
GestioCOF cannot run without it.
There is no permission associated to it: this has to been thought about
2017-02-12 19:49:30 +01:00
Martin Pépin
659c6e720a
Merge branch 'master' into supportBDS
2017-02-12 19:36:17 +01:00
Martin Pépin
e1a8c0e8dd
Add missing files
2017-02-12 19:21:53 +01:00
Martin Pépin
1d7499d3b2
simplify profile edition and test it
2017-02-12 19:21:53 +01:00
Martin Pépin
f5b23174de
Fix test_database issue in bootstrap
...
The test database shouldn't be created manually
2017-02-12 17:39:30 +01: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
0420839b20
Test the authentication
...
- An "outsider" must use django's authentication backend
- A user with a login_clipper should use CAS
2017-02-12 15:38:20 +01:00
Martin Pépin
8b620a5319
PEP8 in gestion/tests.py
2017-02-12 15:38:20 +01:00
Martin Pépin
a28c00e474
Move the auth stuff to gestion/
...
- The login views are in `gestion/`
- The templates are under `gestion/templates/gestion/`
- `cof/shared.py` moves to `gestion/` and is splitted into 3 files:
- The auth backends are in `backends.py`.
- The context_processor is in `context_processor.py`
- The LOCK/UNLOCK functions remain in `shared.py`
2017-02-12 15:38:14 +01:00
Martin Pépin
50b667993f
Merge branch 'master' into supportBDS
...
- Mise en page
- Cleanup des petits cours
- Utilisation de custommail
- Utilisation du ldap du SPI pour fetch les nouveaux comptes
2017-02-12 04:26:43 +01:00
Michele Orrù
94937fc7cd
Add groups cof_members and cof_buro.
...
- remove is_buro from the database in the same way we did for is_cof
- make a decent migration that *SHOULD* take into account is_cof for old
databases. note, this has been tested only through unittests.
- make unittests pass again accordin=gly fixing views.
Note: we should make a method for filtering with specific group members,
something like
map(lambda x: x.profile.cof, filter… group…)
2017-02-11 23:05:51 +01:00
Martin Pepin
dc822d3c72
Add license
2017-02-11 21:35:29 +01:00
Martin Pépin
427859c2f5
Oublis
2017-02-11 21:33:25 +01:00
Martin Pépin
d41d905366
PEP8
2017-02-11 21:20:51 +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
Martin Pépin
65341f0ecb
Minor error
2017-02-11 20:43:49 +01:00
Qwann
b5037329dd
small fixes + migration
...
enable admin interface for bds
2017-02-11 20:36:16 +01:00
Qwann
d46ab87e9b
Merge branch 'michele.orru/gestioCOF-supportBDS' into supportBDS
2017-02-11 20:17:23 +01:00
Qwann
f53ced6a33
Merge branch 'supportBDS' into michele.orru/gestioCOF-supportBDS
2017-02-11 19:21:23 +01:00
Michele Orrù
ee1f29b17d
Make is_cof a property and start developing permissions.
...
Rmeove the is_cof flag to check permission and start implementing
a group and a permission for the respective cof members.
XXX. note: migrations do NOT add old is_cof members to the new group
(as actually they're just on the tests…)
2017-02-11 18:48:13 +01:00
Qwann
b9ed7320ec
Fix user registration
2017-02-11 18:41:47 +01:00
Qwann
fcf392f40d
Merge remote-tracking branch 'origin/tmp' into michele.orru/gestioCOF-supportBDS
2017-02-11 18:02:05 +01:00
Martin Pépin
3365d7b9a1
Updates the decorators
2017-02-11 18:00:01 +01:00
Qwann
b16219f8ee
fixing profile view
2017-02-11 17:57:37 +01:00
Martin Pépin
6c3e1bd2db
Fix the loaddevdata script
2017-02-11 17:18:42 +01:00
Michele Orrù
a2b8dee022
Fix #134 .
...
Fill bds.models with the required fields; add migration scripts, and a stupid
unittests that checks the model really works.
Note: old fields will migrate to datetime.now().
2017-02-11 17:13:48 +01:00
Qwann
5b54d76e36
Merge branch 'Kerl/use_django_custommail'
2017-02-11 16:30:12 +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
27bf59d4c0
Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail
2017-02-11 16:16:00 +01:00
Martin Pépin
b4bf437447
Minor fixes
2017-02-11 16:15:17 +01:00
Michele Orrù
f0c3def935
Make the test really works.
...
This fixes the proble with debug_toolbar,
the fucking toolbar that messes all your tests.
2017-02-11 15:47:31 +01:00
Qwann
5d35112c87
Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail
2017-02-11 15:34:04 +01:00
Qwann
62dc04c19f
cleaning ugly html
2017-02-11 15:33:22 +01:00
Martin Pépin
0e759405c7
Change the migration index
2017-02-11 15:13:29 +01:00
Michele Orrù
376e829502
Reaching a point where I can query /k-fet.
...
Edit forms and views in app kfet to make the depend on gestion.Profile and not
on cof.CofProfile.
2017-02-11 15:07:45 +01:00
Michele Orrù
f50ef1d51a
Merge remote-tracking branch 'origin/supportBDS-fixes1' into supportBDS
2017-02-11 14:26:55 +01:00
Martin Pépin
b639c04549
Fix the registration forms
...
- The former `RegistrationUserProfileForm` is splitted in two.
- There is a new form: `RegistrationCofProfileForm`
2017-02-11 12:42:36 +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
5136e394d4
Merge branch 'Kerl/modernize_petitscours'
2017-02-11 02:54:22 +01:00