diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f3f3038 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "web/extras"] + path = web/extras + url = https://git.neulandlabor.de/j3d1/vue-extras.git diff --git a/core/mail/migrations/0005_alter_eventaddress_event.py b/core/mail/migrations/0005_alter_eventaddress_event.py new file mode 100644 index 0000000..30b79bf --- /dev/null +++ b/core/mail/migrations/0005_alter_eventaddress_event.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.7 on 2024-11-03 18:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0004_alter_event_created_at_alter_item_created_at'), + ('mail', '0004_alter_emailattachment_file'), + ] + + operations = [ + migrations.AlterField( + model_name='eventaddress', + name='event', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to='inventory.event'), + ), + ] diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index 411179e..95e8083 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -4,11 +4,11 @@ services: context: ../../core dockerfile: ../deploy/dev/Dockerfile.backend command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000' - #environment: - # - DATABASE_URL + environment: + - HTTP_HOST=core + #- DATABASE_URL volumes: - ../../core:/code - - ./.backend.env:/code/.env ports: - "8000:8000" diff --git a/web/src/components/AddEventModal.vue b/web/src/components/AddEventModal.vue index 387aeb2..ed25265 100644 --- a/web/src/components/AddEventModal.vue +++ b/web/src/components/AddEventModal.vue @@ -66,7 +66,7 @@ export default { methods: { ...mapActions(['createEvent']), validate_data() { - return this.pre_start <= this.start && this.start <= this.end && this.end <= this.post_end && !!this.event_slug && !!this.event_name; + return this.pre_start <= this.start && this.start <= this.end && this.end <= this.post_end && !!this.slug && !!this.name; }, prepare_date_field(e) { if (!e.target.value) {