Improve restore db

Makefile

@@ -128,9 +128,15 @@ dump:
 
 restore:
 	@echo restoring DB from file `ls -t backup/*.sql.tar | head -1`
+	# retrieve commit number and checkout
+	git checkout $(shell ls -t backup/*.sql.tar | head -1 | cut -d'-' -f4 | cut -d '.' -f1)
+
+	# restore DB
 	docker-compose -f docker-compose-dev.yml run --rm \
 		-v $(shell pwd)/backup/:/backup \
 		postgres sh -c 'exec pg_restore -c -hpostgres -U${DATABASE_USER} -Ox -Ft -d${DB_NAME} `ls -t /backup/*.sql.tar | head -1`'
+
+	# restart web container
 	make restart-web
 
 release:

infoscience_exports/exports/admin.py

@@ -12,8 +12,14 @@
 admin.site.__class__ = TequilaAdminSite
 
 
+class EPFLUserModelAdmin(UserAdmin):
+    list_display = ('username', 'email', 'last_login', 'is_superuser')
+
+
 class ExportLoggedModelAdmin(LoggedModelAdminMixin, ModelAdmin):
-    pass
+    list_display = ('name', 'user', 'updated_at')
+    list_filter = ('updated_at', )
+
 
 admin.site.register(Export, ExportLoggedModelAdmin)
-admin.site.register(User, UserAdmin)
+admin.site.register(User, EPFLUserModelAdmin)

infoscience_exports/exports/models/export.py

@@ -12,7 +12,7 @@ class Export(BulletsSettings,
              ThumbnailSettings,
              LinksSettings,
              GroupBySettings,
-             FormatsSettings,             
+             FormatsSettings,
              models.Model,
              DirtyFieldsMixin,
              ):

infoscience_exports/exports/models/user.py

@@ -10,6 +10,9 @@ class User(AbstractUser):
     classe = models.CharField(max_length=100, null=True, blank=True)
     statut = models.CharField(max_length=100, null=True, blank=True)
 
+    def __str__(self):
+        return self.email
+
     def __unicode__(self):
         return """  Sciper:    %s
                         where:     %s

infoscience_exports/exports/test/locustfile.py

@@ -4,6 +4,8 @@
 def increment():
     increment.i += 1
     return increment.i
+
+
 increment.i = 0
 
 

infoscience_exports/exports/versions.py

@@ -3,14 +3,14 @@
 
 # the release comes from git and should not be modified
 # => read-only
-_release = '0.2.3-12-g087d327'
+_release = '0.2.4-6-gcb346d1'
 
 # you can set the next version number manually
 # if you do not, the system will make sure that version > release
 # => read-write, >_release
-_version = '0.2.4'
+_version = '0.2.5-rc'
 
 # the build number will generate conflicts on each PR merge
 # just keep yours every time
 # => read-only
-_build = '087d3277e331e10c958860dfe2e049bba40ab05a'
+_build = 'cb346d1c9b57fe461ae8ae43467c25ea5ef371d7'