From 7bb2b23ba59a64d68512df45c57ae38bbf347dac Mon Sep 17 00:00:00 2001 From: Fred Pauchet Date: Wed, 28 Sep 2016 13:59:22 +0200 Subject: [PATCH] define default ordering and list_filter --- .gitlab-ci.yml | 2 +- src/db.sqlite3 | Bin 155648 -> 155648 bytes src/sherlock/admin.py | 1 + src/sherlock/models.py | 3 +++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d100f9..7aa7f73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ before_script: test:python-3.4: stage: test image: python:3.4-slim - script: + script: - flake8 src/ - coverage run src/manage.py test sherlock - coverage report -m diff --git a/src/db.sqlite3 b/src/db.sqlite3 index 5d0665cb6abab9096ff7a3dbce1afac1e06a0997..b10c6e284de7d359392d96cc24d9dd806047570e 100644 GIT binary patch delta 1286 zcmaiyZ)h839LMjuGqjhP{FXKi(n(FBGC^{Ep8K0iU1w<5EMii!g{F51TbtCjNw2}J zWl3;$odxlYe+Uw*%(=Z0Hl+)B5fsL{4MDIg4t=G4Q8pM%hLb_@g~GhMjI=nN9MAXF z_w&8y`Tl;VR@qal><4>L?89dV95E_zhpA?^I0R+A_dVpR-R<3Tw3T)(QSNK5rRrkA z_1ft^+7VlFgo8rfNXv7D(p)Yh7)B<|PYUBxvxT{Nqj-F3ETi%IbUYHD*7!s*p45t3 za#D<^MzXO;qNJxZqLsph;YdO>Pic5?CKrong>u)~-i5q28qY_w`Ds0wE5!%Xl9mmN zS}JxzH--$&IAEsbBz-Vi&<*p;9yk%_qa{5Vm9%6+(2CLH(HV6rGkPdLDvXr$(N|vA zjG^opKQgZmMCGV)=nX9;&5jqP>^Lvsv@tXNsxd?|k;(an?Gj zV|q%;MQ8Co9uql0aDecBLP8QBl7gHd@~S{i_aVEK^5%-a_UmVzsFj8~1shPWd5&I$ z=X;nK`oF^H+Q!Q5{a!V|2e;#iBC15J{dk{Tdcg-LDfkn%;6B`h@8Mgx0$)Q7zJf2{ z9DE8N!TazoybUMo{?AbYdK?Twtv*{jZ1vjOZfl#Zp31oulxBQTuC!c2-A}`pX4ZK) z10O@Vx_AV-o?=+!v!ufkuO;o4v{~Y*SFfPMyBVL8uC)AM;=7LR;++qi=beY0baio^ z-8<}KDNmSv5wT$++3jKTd5WLMA&mX9A}O4Cf|bMu@~O>-iy=YbM1?0b?vERM zFo0!0QA2|4#~i^JGp)_w#@vJukvO6fnMnO@+dO$PKV~(vBLGWS#-!h~9l-x1KzYIi zL@ua^Qcw)te#l4*%EPrt7yJq8{8i zLBVaf3TNR>&_ITE_wVi-?hEdB+!NJB-o5ZvxTO(-n-%%NK?yBvv!6$UH)sFyHxpMM zatH5ryDi5f&MaVuS)5er=d69q#{D?<}2V-r0C zLo*X&qs^D!8*Y#h;9tnV|C|3S|9k$6{HOVk^6%&0$-kL@E&p=zFgI66*o3^aq~C|a5C_#b80hkI$BO= zyu+xs{mpGg2@#-k9x?Dg0&2U#zx~mFMim1oe+K@?{0I5x^Vjf4@|*Ds^L^ku%eR=X zlFxr*qds4~1`jKPBRiuJ(4o2pK)0KL+-_`cWniplWNu(!U~a#2CJ4-8(cs3W(#*=( zP|wW7z{Jo9p^^)`N<&LMBSSMY3q!a{#qHx$p`@FG>2vY diff --git a/src/sherlock/admin.py b/src/sherlock/admin.py index 2c03253..febd939 100644 --- a/src/sherlock/admin.py +++ b/src/sherlock/admin.py @@ -8,6 +8,7 @@ class MesureAdmin(admin.ModelAdmin): model = Mesure list_display = ('__str__', 'value', 'category') + list_filter = ('gauge__category',) admin.site.register(Category) admin.site.register(Gauge) diff --git a/src/sherlock/models.py b/src/sherlock/models.py index 394811b..d075451 100644 --- a/src/sherlock/models.py +++ b/src/sherlock/models.py @@ -41,6 +41,9 @@ class Mesure(models.Model): objects = MesureManager() + class Meta: + ordering = ('-moment',) + def __str__(self): return "{} {}".format(self.moment.strftime('%Y-%m-%d %H:%M'), self.value)