fix admin license field date_to

prod
Dmitriy Shesterkin 9 years ago
parent 4d048ed871
commit c23071925a
  1. 9
      Makefile
  2. 22
      fabfile.py
  3. 4
      src/customer/admin.py

@ -1,4 +1,4 @@
.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop
.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop upgrade-develop
# target: all - Default target. Does nothing.
all:
@ -74,7 +74,12 @@ worker:
qa:
pytest
# target: update-develop - Run push change in repo develop branch and deploy for develop server
# target: update-develop - Run push change in repo develop branch and deploy for develop server with restart only web container
update-develop:
git push origin develop
fab update
# target: upgrade-develop - Run push change in repo develop branch and deploy for develop server with rebuild container
upgrade-develop:
git push origin develop
fab upgrade

22
fabfile.py vendored

@ -17,14 +17,32 @@ def pull():
@task
def docker_update():
def docker_rebuild():
with cd(PROJECT_DIR):
run('docker-compose build')
run('docker-compose down')
run('docker-compose up -d')
@task
def docker_restart():
with cd(PROJECT_DIR):
run('docker-compose restart web')
@task
def docker_bash():
with cd(PROJECT_DIR):
sudo('docker-compose exec web bash')
@task
def upgrade():
pull()
docker_rebuild()
@task
def update():
pull()
docker_update()
docker_restart()

@ -47,10 +47,10 @@ class LicenseAdmin(admin.ModelAdmin):
license_owner.short_description = 'Компания'
def balance_days(self, obj):
try:
if obj.date_to:
delta = obj.date_to - timezone.now().date()
return delta.days
except AttributeError:
else:
return '-'
balance_days.short_description = 'Остаток дней'

Loading…
Cancel
Save