DGNum/gestioCOF
16
2
Fork 1
Code Issues 78 Pull requests 14 Projects Releases 12 Packages Wiki Activity
1601 commits 40 branches 17 tags 59 MiB
Commit graph

1601 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aurélien Delobelle
94ab754f82 Move group-related views tests to kfetauth tests 2017-10-25 20:26:35 +02:00
Aurélien Delobelle
94f21c062a SnippetCmsGroupForm should not clean previous permissions 2017-10-25 03:12:22 +02:00
Aurélien Delobelle
e39f88991e Fix migration history 2017-10-24 19:49:52 +02:00
Aurélien Delobelle
03a0c58869 Merge branch 'aureplop/kfet-auth' into aureplop/kfet-auth_cms 
+ Move migrations.
 2017-10-24 19:48:47 +02:00
Aurélien Delobelle
aa405d212a Fix tests… 
…due to merge of aureplop/kfet-auth
 2017-10-24 19:44:02 +02:00
Aurélien Delobelle
c524da22fe Merge branch 'aureplop/kfet-auth' into aureplop/kfet-auth_cms 
+ Move migrations.
+ Update tests to use new url names and new permissions.
 2017-10-24 19:41:45 +02:00
Aurélien Delobelle
09290131d5 Merge branch 'master' into aureplop/kfet-auth 2017-10-24 19:31:36 +02:00
Aurélien Delobelle
8e8e9aa076 Fix migration history 2017-10-24 19:25:20 +02:00
Aurélien Delobelle
40ceaf411a Merge branch 'master' into aureplop/kfet-auth 
- Modify tests of group form-views: using Group model of kfetauth
doesn't add 'K-Fêt' to the group name.
 2017-10-24 18:33:38 +02:00
Aurélien Delobelle
53ef8b517a Merge branch 'test/views' 2017-10-24 18:01:49 +02:00
Aurélien Delobelle
af3a7cf697 Reapply fix to kfetauth (…) and fix tests 2017-10-24 17:56:14 +02:00
Aurélien Delobelle
1cc51f17a3 Prevent connection to LDAP when settings is None 2017-10-24 17:55:02 +02:00
Aurélien Delobelle
8673da1874 Fix migration conflict 2017-10-24 16:52:57 +02:00
Aurélien Delobelle
8b1f174b13 manage.py is executable 2017-10-24 16:46:15 +02:00
Aurélien Delobelle
8cdb4c62fc Merge branch 'master' into test/views 2017-10-24 16:45:26 +02:00
Martin Pepin
cb820e1414 Merge branch 'aureplop/fix-tirage-pk-conflict' into 'test/views' 
Fix tirage pk conflicts with postgres

See merge request !262
 2017-10-18 11:40:02 +02:00
Aurélien Delobelle
097ee44131 Organize migrations to avoid issues with… 
…migrations already applied from master.
 2017-10-17 16:50:39 +02:00
Aurélien Delobelle
2c76bea1e6 Better display of objects of BasePermissionsField 
- Permissions are grouped by content type and displayed under its
verbose_name_plural.
- Default permissions appear before custom ones.
- Use `permissions-field` class to enhance display.
 2017-10-17 16:50:39 +02:00
Aurélien Delobelle
07f1a53532 CMS permissions can be managed from group views. 
These permissions concern pages, images, documents and access to the
wagtail admin site. Only appropriate elements can be selected: only the
kfet root page and its descendants, same for the kfet root collection
(for images and documents), and kfet snippets (MemberTeam).

Add django-formset-js as dependency to help manipulate formsets.

K-Fêt groups created from "devdata" commands get suitable permissions
for the CMS.
 2017-10-17 16:50:39 +02:00
Aurélien Delobelle
82582866b4 Clean forms/views/urls related to kfetauth.Group… 
…and it becomes possible to add extra forms/formsets to the create and
update group views.
 2017-10-17 16:50:39 +02:00
Aurélien Delobelle
5502c6876a Clean permissions objects 
- Define default permissions of kfet models.
- Unused default permissions are deleted.
- `kfet.manage_perms` is now splitted as `kfetauth.(view|add|change)_group` permissions.
 2017-10-17 16:49:45 +02:00
Aurélien Delobelle
46187659ed Fix tirage pk conflicts with postgres 2017-10-17 14:42:39 +02:00
Martin Pépin
fccad5edee rename root -> kfet_genericteam in fixtures 2017-10-16 14:31:02 +02:00
Martin Pépin
b9aaea0f99 Merge branch 'master' into Production 2017-10-16 14:26:05 +02:00
Martin Pepin
47e48e36b2 Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views' 
Fix fields cleaning with unreachable items when…

See merge request !260
 2017-10-12 19:21:16 +02:00
Aurélien Delobelle
df7594a105 Move KFetConfigForm to kfet.config 
Import in `ready` method of kfet app config of `kfet.forms` may be
annoying because it starts executing `__init__` methods of fields.
Causing failures if these methods does DB calls, as `ready` may be
called before applying migrations.
 2017-10-12 13:53:48 +02:00
Aurélien Delobelle
e6fab703ee Use convenience imports 2017-10-12 13:42:06 +02:00
Martin Pepin
c17ed416c4 Merge branch 'aureplop/kfet-auth_perms' into 'aureplop/kfet-auth' 
Cleaner use of Group in kfet app

See merge request !257
 2017-10-12 11:30:44 +02:00
Aurélien Delobelle
85657591f5 Fix fields cleaning with unreachable items when… 
… object is being created.
 2017-10-12 11:10:30 +02:00
Aurélien Delobelle
085a068020 Merge branch 'aureplop/kfet-auth' into aureplop/kfet-auth_perms 2017-10-12 11:07:16 +02:00
Aurélien Delobelle
c59bc487c3 Merge branch 'test/views__' into test/views 2017-10-11 23:35:38 +02:00
Aurélien Delobelle
f4a7e9dbf1 Verbosity should stay calm. 2017-10-11 23:34:43 +02:00
Aurélien Delobelle
03deb54d92 Merge branch 'Kerl/fix-JSONField-exn' into 'master' 
djangorestframework 3.7 breaks with Django 1.8

See merge request !259
 2017-10-11 23:18:05 +02:00
Martin Pépin
3b1d8487e2 Merge branch 'aureplop/kfet-auth_backends' 2017-10-11 22:59:28 +02:00
Martin Pépin
f8bb5b081e Merge branch 'Kerl/fix-JSONField-exn' into test/views 2017-10-10 21:37:40 +02:00
Martin Pépin
3f6c5be748 Upgrade python packages before testing 2017-10-10 21:27:15 +02:00
Martin Pépin
e0ab7f5f94 Fix migration conflict 2017-10-10 21:21:28 +02:00
Martin Pépin
116b4da1a5 Merge branch 'test/views_kfet' into test/views 2017-10-10 21:15:49 +02:00
Martin Pépin
29ef297b2a try to set the redis password… 2017-10-10 21:14:52 +02:00
Martin Pépin
503b305299 djangorestframework 3.7 breaks with Django 1.8 
JSONField doesn't exist in Django 1.8
 2017-10-10 18:34:18 +02:00
Martin Pépin
3d22a1b029 Merge branch 'master' into test/views 2017-10-10 15:39:18 +02:00
Martin Pépin
528532cca7 Merge branch 'aureplop/fix-ci' 2017-10-10 15:35:22 +02:00
Martin Pépin
4d1cb3c2d7 Set password for redis in CI 2017-10-10 15:26:14 +02:00
Aurélien Delobelle
57a143e0e1 Merge branch 'PEI' into 'master' 
Statut PEI + cotisation gratuite

See merge request !258
 2017-10-06 11:06:44 +02:00
Martin Pépin
435e211b3d Add a "PEI" status + "Gratis" subscription fees 2017-10-02 13:58:52 +02:00
Aurélien Delobelle
596868f5b6 plop 2017-09-30 03:03:48 +02:00
Aurélien Delobelle
8ea5775d61 Add test for callable queryset with Unselectable… 2017-09-30 02:14:01 +02:00
Aurélien Delobelle
ded824bddd Cleaner use of Group in kfet app 
KFetGroup model
- Provides a distinction from non-kfet Groups.
- Convert code appropriately.
- Initially filled from Groups containing K-Fêt (this was the previous
distinction) in the kfetauth.0002 migration.

Permission proxy model (kfetauth app)
- Proxy of the django.contrib.auth Permission model.
- Adds the 'kfet' manager which returns only kfet-related permissions.

KeepUnselectableModelFormMixin
- Helps to keep the unselectable items of many-to-many field for
ModelForm.
- 'kfetauth' forms (related to KFetGroup) use this mixin.

Using KFetGroup allows to simplify the 'kfet/account_group_form.html' template.

A bug is also fixed in 'kfet/form_field_snippet.html', which could lead to
prevent field displays if they used CheckboxSelectMultiple widget.
 2017-09-29 22:37:30 +02:00
Martin Pépin
b73faa3b84 Merge branch 'master' into Production 2017-09-25 18:40:00 +02:00
Martin Pepin
22413d861c Merge branch 'aureplop/fix-attributions-admin' into 'master' 
Fix attribution inlines of participant in admin

See merge request !255
 2017-09-25 18:38:05 +02:00