Martin Pepin
3aab76613a
Merge branch 'Aufinal/permissions' into 'master'
...
Permissions par évènement
See merge request cof-geek/GestionEvenementiel!15
2018-05-03 14:34:36 +02:00
Martin Pépin
10e4393bda
Merge branch 'master' into Aufinal/permissions
2018-05-03 12:45:29 +02:00
Martin Pépin
94b2529ab6
Use the correct user model when creating users
2018-05-03 12:38:31 +02:00
Martin Pépin
306ca2bcc8
switch to channels 2.x
2018-05-03 12:34:23 +02:00
Martin Pépin
ce9ee193d8
asgi-redis has been renamed to channels_redis
2018-05-03 12:25:37 +02:00
Ludovic Stephan
392e5cf144
Revert c894d35 --- Fuck django-guardian
...
This reverts commit c894d35932
2017-09-19 11:48:39 +02:00
Ludovic Stephan
c894d35932
Scrap useless perms
2017-09-19 10:46:26 +02:00
Erkan Narmanli
cbd5a7db0b
Merge branch 'aureplop/appconfigs' into 'master'
...
Update AppConfigs
See merge request !23
2017-08-30 21:22:05 +02:00
Aurélien Delobelle
e1b4dc1651
Update AppConfigs
2017-08-19 15:36:45 +02:00
Ludovic Stephan
0b1641a002
Tests and group uniqueness
2017-08-17 15:10:46 +02:00
Ludovic Stephan
64a979a4ac
Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into Aufinal/permissions
2017-08-17 14:23:13 +02:00
Erkan Narmanli
677c7f3367
Merge branch 'Qwann/Serializers' into 'master'
...
Event Seralizers (part 1)
See merge request !17
2017-08-13 18:28:21 +02:00
Erkan Narmanli
26d7ad474f
Merge branch 'master' into 'Qwann/Serializers'
...
# Conflicts:
# event/models.py
2017-08-13 18:27:40 +02:00
Erkan Narmanli
7d406f9370
Merge branch 'aureplop/serializers' into 'Qwann/Serializers'
...
Some serializers fix + base testcases + tests
See merge request !21
2017-08-13 18:23:47 +02:00
Aurélien Delobelle
18037246e1
Remake migrations
2017-08-13 18:05:24 +02:00
Aurélien Delobelle
f33028892f
Add API tests for Event/Place/ActivityTag/ActivityTemplate models
...
This tests mainly cover cases whose API user is friendly.
Should be extended with illegal things.
ActivityTag, ActivityTemplate and Place models got tests for root and
specific-event instance.
2017-08-13 18:05:24 +02:00
Aurélien Delobelle
f4041d6e02
Prepare base structures for API' tests.
2017-08-13 18:05:24 +02:00
Aurélien Delobelle
fc4930a49e
Clean serializers and viewsets
...
Event-based urls
- Add viewset mixin 'EventUrlViewSetMixin' to get the event from the
'event_pk' url kwarg of a view.
- Add url serializer fields for object which can be accessed with a
root-level and/or event-specific url ('EventHyperlinked*Field).
Update viewsets and serializers to use these + clean inheritance
viewsets.
2017-08-13 18:05:24 +02:00
Aurélien Delobelle
07d4c3ead1
Reflect changes on validators/fields
2017-08-12 15:01:57 +02:00
Aurélien Delobelle
3cacf7ad1e
Merge branch 'Qwann/SmallFixes' into 'master'
...
help text added
See merge request !20
2017-08-08 11:09:55 +02:00
Aurélien Delobelle
cd78757244
Clean some models
...
Add/fix some field names, verbose_name, help_text, on_delete (for
foreign keys), etc.
2017-08-03 12:09:03 +02:00
Aurélien Delobelle
cd4695c27a
Add some __init__ modules.
...
They are pythonicly not necessary, but Django misses testcases and
migrations if they are not present.
2017-08-03 12:01:10 +02:00
Qwann
ee411d06a6
help text added
2017-08-02 17:28:26 +02:00
Qwann
541939ea17
things moved or modified
2017-07-27 15:01:13 +02:00
Qwann
c9cdc67b4f
creation_date field updated
2017-07-27 12:04:30 +02:00
Qwann
7bec90d7a4
todo added
2017-07-27 11:54:15 +02:00
Qwann
9362d4c1f0
EventSpecificSerializer is now a mixin
2017-07-27 11:50:47 +02:00
Qwann
2ac3cd345c
Merge branch 'master' into Qwann/Serializers
2017-07-26 15:49:09 +02:00
Aurélien Delobelle
2e5712562f
Merge branch 'Qwann/SmallFixes' into 'master'
...
Small Fixes
See merge request !19
2017-07-26 15:43:12 +02:00
Qwann
cb9505f289
Merge branch 'Qwann/SmallFixes' into Qwann/Serializers
2017-07-26 15:43:12 +02:00
Qwann
9860a19f2d
doc for future comportement
2017-07-26 15:41:20 +02:00
Qwann
814199da71
docstring + rename some mixins
2017-07-26 14:51:29 +02:00
Qwann
5e1a0cc0ef
fixe tests
2017-07-26 13:48:12 +02:00
Qwann
f87fe3d5a0
renamed attribute + PEP
2017-07-26 13:16:52 +02:00
Qwann
fdce944820
typos
2017-07-26 13:11:58 +02:00
Qwann
be5a90cf67
EventSerializer field fixes
2017-07-25 19:00:12 +02:00
Qwann
d19e5978b6
EventSpecificSerializer provides event attribute
2017-07-25 18:54:34 +02:00
Aurélien Delobelle
4e99a09165
Merge branch 'Qwann/SmallFixes' into 'master'
...
Activity parent nullable
- Fix db error if an activity doesn't have a parent (activity template).
See merge request !18
2017-07-25 15:04:12 +02:00
Qwann
771fdf878e
renamed users api sub application
2017-07-25 14:40:34 +02:00
Qwann
b2e6d822da
Merge branch 'master' into Qwann/Serializers
2017-07-25 14:13:00 +02:00
Qwann
c709583e06
Activity parent nullable
2017-07-25 14:07:20 +02:00
Qwann
3246552eba
tests factorised
2017-07-25 14:02:57 +02:00
Ludovic Stephan
25df34e57e
Add filter to permissions
2017-07-24 15:30:16 +02:00
Ludovic Stephan
084a5d9ff5
Merge branch 'Qwann/SmallFixes' into 'master'
...
small fixes
See merge request !16
2017-07-24 15:28:07 +02:00
Qwann
a4da5d94c4
eventspecific tests
2017-07-23 18:23:25 +02:00
Qwann
7585a8246d
url names + API default permissions
2017-07-23 18:23:02 +02:00
Qwann
e1f8a84111
Merge branch 'Qwann/SmallFixes' into Qwann/Serializers
2017-07-23 16:25:21 +02:00
Qwann
cab370421b
small fixes
2017-07-23 16:21:11 +02:00
Qwann
ac6b8058f4
test started
2017-07-23 16:06:52 +02:00
Qwann
d7ee270fbf
activity template serializer added
2017-07-22 03:12:50 +02:00
