Commit 1990a14d authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier

fix: resolve conflict

# Conflicts:
#   djangoldp_joboffer/models.py
parents 7112bc9d d0f368da
Pipeline #3934 passed with stage
in 28 seconds
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-05-24 14:32
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('djangoldp_joboffer', '0002_auto_20190404_1451'),
]
operations = [
migrations.AlterField(
model_name='joboffer',
name='closingDate',
field=models.DateField(),
),
migrations.AlterField(
model_name='joboffer',
name='description',
field=models.TextField(),
),
migrations.AlterField(
model_name='joboffer',
name='skills',
field=models.ManyToManyField(to='djangoldp_skill.Skill'),
),
migrations.AlterField(
model_name='joboffer',
name='title',
field=models.CharField(max_length=255),
),
]
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-06-12 14:46
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('djangoldp_conversation', '0003_auto_20190503_0323'),
('djangoldp_joboffer', '0003_auto_20190524_1432'),
]
operations = [
migrations.AddField(
model_name='joboffer',
name='conversation',
field=models.ManyToManyField(blank=True, to='djangoldp_conversation.Conversation'),
),
]
from django.conf import settings
from django.db import models
from djangoldp_conversation.models import Conversation
from djangoldp.models import Model
from djangoldp_skill.models import Skill
......@@ -7,15 +8,16 @@ from djangoldp_skill.models import Skill
class JobOffer(Model):
author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='jobOffers', on_delete=models.CASCADE)
title = models.CharField(max_length=255, blank=True, null=True)
description = models.CharField(max_length=255, blank=True, null=True)
skills = models.ManyToManyField(Skill, blank=True)
title = models.CharField(max_length=255)
description = models.TextField()
skills = models.ManyToManyField(Skill)
creationDate = models.DateField(auto_now_add=True)
closingDate = models.DateField(blank=True, null=True)
closingDate = models.DateField()
conversation = models.ManyToManyField(Conversation, blank=True)
class Meta:
auto_author = 'author'
nested_fields = ["skills"]
nested_fields = ["skills", "conversation"]
container_path = 'job-offers/'
rdf_type = 'hd:joboffer'
depth = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment