Merge pull request #46 from HE-Arc/35-change-new_community-and-send-o…

…nly-success-or-something-like-that 35 change new community and send only success or something like that
HE-Arc · Mar 29, 2024 · a564329 · a564329
2 parents ab63d74 + 3474359
commit a564329
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,12 @@
 .idea
 db.sqlite3
 __pycache__
-
+*.env
 # Capistrano
 /config/
 Capfile
 Gemfile
 Gemfile.lock
 capistrano.log
+<<<<<<< HEAD
 
-# api
-/api/.env
diff --git a/api/masteriqapp/migrations/0005_category_image_path.py b/api/masteriqapp/migrations/0005_category_image_path.py
@@ -1,5 +1,7 @@
 # Generated by Django 5.0.2 on 2024-03-08 08:42
+from os import path
 
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -13,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='category',
             name='image_path',
-            field=models.CharField(default='data\\images\\default.jpeg', max_length=255),
+            field=models.CharField(default=path.join(settings.IMAGES_FOLDER, 'default.jpeg'), max_length=255),
         ),
     ]