From d242620f14bf126666a520bdfa4e18bd70ab6f6a Mon Sep 17 00:00:00 2001 From: mc33 Date: Fri, 24 Jan 2025 01:14:22 +0100 Subject: [PATCH 1/5] remove migrations form gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ddb2374..22e36e1 100644 --- a/.gitignore +++ b/.gitignore @@ -365,7 +365,7 @@ FodyWeavers.xsd .venv* .venv-main* venv -*migrations/ + server_config.py -- 2.47.2 From 36e504c0aab30b06e5ebc41d7eeb7ba6009099d4 Mon Sep 17 00:00:00 2001 From: mc33 Date: Fri, 24 Jan 2025 01:15:31 +0100 Subject: [PATCH 2/5] remove migrations form gitignore --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 22e36e1..dd3f7e1 100644 --- a/.gitignore +++ b/.gitignore @@ -373,10 +373,6 @@ server_config.py db.sqlite3 media/ /mycaldav/export.pdf -/vehicles/migrations/ -/vehicles/migrations_save/ -/carnet_rouge/migrations/ -/collabs/migrations/ db.sqlite3 /Reskreen/my.cnf db.sqlite3 -- 2.47.2 From 594b62ab11cbc38d0bd6141e86be0c7e3dff89a0 Mon Sep 17 00:00:00 2001 From: mc33 Date: Fri, 24 Jan 2025 01:17:57 +0100 Subject: [PATCH 3/5] remove migrations from CI/DI --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a53b71..197c435 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apk update && apk add --no-cache mariadb-connector-c-dev && apk add --no-cac RUN python -m venv venv \ && . venv/bin/activate \ && pip install --no-cache-dir -r requirements.txt -RUN source venv/bin/activate && python manage.py makemigrations && python manage.py migrate +#RUN source venv/bin/activate && python manage.py makemigrations && python manage.py migrate EXPOSE 8080 -- 2.47.2 From aca6819a9cadf4b0aa290c207c75798c923a4056 Mon Sep 17 00:00:00 2001 From: mc33 Date: Fri, 24 Jan 2025 01:18:12 +0100 Subject: [PATCH 4/5] update gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dd3f7e1..1bd6c59 100644 --- a/.gitignore +++ b/.gitignore @@ -366,7 +366,7 @@ FodyWeavers.xsd .venv-main* venv - +*/migrations/__pycache__/ server_config.py ./db.sqlite3 -- 2.47.2 From fbeae9a3178d203040934e3ff753902dd1f0c2a7 Mon Sep 17 00:00:00 2001 From: mc33 Date: Fri, 24 Jan 2025 02:04:23 +0100 Subject: [PATCH 5/5] reverte changes --- vehicles/admin.py | 4 ++-- vehicles/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vehicles/admin.py b/vehicles/admin.py index bcadf88..eb805ad 100644 --- a/vehicles/admin.py +++ b/vehicles/admin.py @@ -6,7 +6,7 @@ from vehicles.models import * class _vhc_admin(admin.ModelAdmin): - list_display = ('sName', 'nBases', 'nStatus', "bLucas", "bDrap") + list_display = ('sName', 'nBases', 'nStatus', "bLucas") ordering = ["nOrder"] @@ -24,7 +24,7 @@ class _vhc_admin(admin.ModelAdmin): 'fields': ('sName', "nBases") }), ('Statut et équipement', { - 'fields': ('nStatus', 'bLucas', "bDrap") + 'fields': ('nStatus', 'bLucas') }), ('Informations diverses', { 'fields': ("nOrder", "nType") diff --git a/vehicles/models.py b/vehicles/models.py index e1544d7..d37d1e3 100644 --- a/vehicles/models.py +++ b/vehicles/models.py @@ -38,7 +38,7 @@ class Vehicles(models.Model): nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1) nType = models.CharField('Type', max_length=1, choices=VHC_CHOICES, default=1) bLucas = models.BooleanField("Lucas", default=0) - bDrap = models.BooleanField("Drap HRC", default=0) + #bDrap = models.BooleanField("Drap HRC", default=0) nOrder = models.IntegerField("Ordre", default=0) nTeam = models.CharField('Équipe', max_length=1, choices=TEAM_NUMBER, default=1) -- 2.47.2