diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-07 13:20:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-08-07 13:20:12 +0200 |
| commit | ef399e463e9ad6537e17f8d7aa3a16bfc86e4544 (patch) | |
| tree | a9911a53c42a09477d41a9d7c2255513d483558f /chimere/admin.py | |
| parent | a50daee604b44c097a688f1ef94346ad3f804d41 (diff) | |
| download | Chimère-ef399e463e9ad6537e17f8d7aa3a16bfc86e4544.tar.bz2 Chimère-ef399e463e9ad6537e17f8d7aa3a16bfc86e4544.zip | |
Map: manage group permissions - fix some issues on permissions - tests
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 80448f3..9f65707 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -42,7 +42,7 @@ from chimere.forms import MarkerAdminForm, RouteAdminForm, MapAdminForm,\ from chimere.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Map, ColorTheme, Color, \ MultimediaFile, PictureFile, Importer, Layer, MapLayers,\ - PropertyModelChoice, MultimediaExtension, Page, MapUsers,\ + PropertyModelChoice, MultimediaExtension, Page, MapUsers, MapGroups,\ get_maps_for_user, get_users_by_map from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\ CSVManager @@ -321,13 +321,17 @@ class UserInline(admin.TabularInline): model = MapUsers extra = 1 +class GroupInline(admin.TabularInline): + model = MapGroups + extra = 1 + class MapAdmin(admin.ModelAdmin): """ Specialized the map field. """ form = MapAdminForm exclude = ['upper_left_corner', 'lower_right_corner'] - inlines = [UserInline, LayerInline] + inlines = [UserInline, GroupInline, LayerInline] list_display = ['name', 'order', 'available', 'default'] def importing(modeladmin, request, queryset): |