summaryrefslogtreecommitdiff
path: root/ishtar_common/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-23 11:07:45 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-23 11:07:45 +0200
commit7924c43af9044cfd40f36bd8a84378417223d95b (patch)
tree78197ea5c36baaff4fcc1a53580eb3d586630b39 /ishtar_common/admin.py
parent54b87741a26a2bd805ed32200b082ca07ee0e27d (diff)
parent0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff)
downloadIshtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2
Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip
Merge branch 'master' into v0.9
Conflicts: ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'ishtar_common/admin.py')
-rw-r--r--ishtar_common/admin.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index b7ad530b7..675d85ec5 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -236,7 +236,13 @@ class OperationTypeAdmin(GeneralTypeAdmin):
admin.site.register(models.OperationType, OperationTypeAdmin)
-basic_models = [models.IshtarUser, models.DocumentTemplate]
+
+class IshtarUserAdmin(admin.ModelAdmin):
+ readonly_fields = ('password',)
+
+admin.site.register(models.IshtarUser, IshtarUserAdmin)
+
+basic_models = [models.DocumentTemplate]
if settings.COUNTRY == 'fr':
basic_models += [models.Arrondissement, models.Canton]