Merge branch 'master' into develop

1 files changed, 27 insertions, 1 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index cba10ea0d..9f8265033 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2017 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -306,6 +306,32 @@ class ItemKeyAdmin(admin.ModelAdmin):
 admin.site.register(models.ItemKey, ItemKeyAdmin)
 
 
+class AdministrationScriptAdmin(admin.ModelAdmin):
+    list_display = ['name', 'path']
+
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ('path',)
+        return []
+
+admin.site.register(models.AdministrationScript, AdministrationScriptAdmin)
+
+
+class AdministrationTaskAdmin(admin.ModelAdmin):
+    readonly_fields = ('state', 'creation_date', 'launch_date',
+                       'finished_date', "result", )
+    list_display = ['script', 'state', 'creation_date', 'launch_date',
+                    'finished_date', "result"]
+    list_filter = ['script', 'state']
+
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ("script", ) + self.readonly_fields
+        return self.readonly_fields
+
+admin.site.register(models.AdministrationTask, AdministrationTaskAdmin)
+
+
 basic_models = [models.DocumentTemplate, models.IshtarUser]
 if settings.COUNTRY == 'fr':
     basic_models += [models.Arrondissement, models.Canton]