summaryrefslogtreecommitdiff
path: root/ishtar_common/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-10 12:18:11 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-10 12:18:11 +0200
commit37234e1423fb4ce64ceafe7bec90960b8da86793 (patch)
treece7a3393b28403e6f053704ac6f8f0b9da028d07 /ishtar_common/admin.py
parentb39fe8bbbb3330087abf68f0ed7fad68c9ee60f0 (diff)
downloadIshtar-37234e1423fb4ce64ceafe7bec90960b8da86793.tar.bz2
Ishtar-37234e1423fb4ce64ceafe7bec90960b8da86793.zip
Serialization - restore: manage history (or not)
Diffstat (limited to 'ishtar_common/admin.py')
-rw-r--r--ishtar_common/admin.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 75e30a49c..691e68b26 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1448,17 +1448,7 @@ admin_site.register(models.ExportTask, ExportTaskAdmin)
"""
-class Media:
- js = (
- 'js/myscript.js', # project's static folder ( /static/js/myscript.js )
- )
-$(document).ready(function(){
- $('form').submit(function() {
- var c = confirm("continue submitting ?");
- return c;
- });
-})
"""
@@ -1499,11 +1489,17 @@ launch_import_action.short_description = _("Launch import")
class ImportTaskAdmin(admin.ModelAdmin):
exclude = ('creation_date', 'launch_date', 'finished_date')
- list_display = ['creation_date', "source", 'state', 'launch_date',
- 'finished_date']
+ list_display = ['creation_date', "source", 'state', "import_user",
+ 'launch_date', 'finished_date']
list_filter = ['state']
+ form = make_ajax_form(models.ImportTask, {'import_user': 'user'})
actions = [launch_import_action]
+ class Media:
+ js = (
+ 'js/admin/archive_import.js',
+ )
+
admin_site.register(models.ImportTask, ImportTaskAdmin)