diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 23:28:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 23:28:18 +0200 |
| commit | 839108483e4e133d773d6ef22399ec7e1dd93db3 (patch) | |
| tree | 9a1c91362d33573de16abcb76befa015e3d8dfde | |
| parent | 407a51f6ffae6454207dad8a295b5e7b1abfd65f (diff) | |
| parent | 5f77b4d18fdd1f4b8c6e967d65dc949197a28243 (diff) | |
| download | Ishtar-839108483e4e133d773d6ef22399ec7e1dd93db3.tar.bz2 Ishtar-839108483e4e133d773d6ef22399ec7e1dd93db3.zip | |
Merge branch 'v0.9' into wheezy
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 4 | ||||
| -rw-r--r-- | ishtar_common/views.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 7a4f6fe0f..638061d6f 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -742,7 +742,7 @@ "model": "ishtar_common.importtarget", "fields": { "comment": null, - "target": "find__preservation_to_consider", + "target": "find__preservation_to_considers", "column": 46, "formater_type": 23, "concat_str": null, @@ -2031,4 +2031,4 @@ "force_new": false } } -]
\ No newline at end of file +] diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 296d56648..f4a8d02e2 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -349,7 +349,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], # if not specific any perm is relevant (read right) if specific_perms and perm not in specific_perms: continue - if request.user.has_perm(model._meta.app_label + '.' + perm) \ + cperm = model._meta.app_label + '.' + perm + if cperm in request.user.get_all_permissions() \ or (request.user.is_authenticated() and request.user.ishtaruser.has_right( perm, session=request.session)): |