From fc2279dbd1d2abce1fbde148223fe93c6e7d47e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Mon, 18 Jul 2011 15:29:47 -0400 Subject: [PATCH] no app project dependance --- project/recrutement/models.py | 15 ++++++++++++++- src/auf.django.emploi/auf/django/emploi/models.py | 10 +--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/project/recrutement/models.py b/project/recrutement/models.py index c20b856..bbc0556 100755 --- a/project/recrutement/models.py +++ b/project/recrutement/models.py @@ -11,7 +11,8 @@ import settings import datamaster_modeles.models as ref from project.rh.models import Poste from recrutement.workflow import grp_evaluateurs_recrutement -from auf.django.emploi.models import * +from auf.django.emploi import models as emploi +from auf.django.emploi.models import TYPE_PIECE_CHOICES ### CONSTANTES #NOTES @@ -42,6 +43,18 @@ class Metadata(models.Model): class Meta: abstract = True +class Candidat(emploi.Candidat): + class Meta: + proxy = True + +class OffreEmploi(emploi.OffreEmploi): + class Meta: + proxy = True + +class CandidatPiece(emploi.CandidatPiece): + class Meta: + proxy = True + class OffreEmploiManager(models.Manager): def get_query_set(self): fkeys = ('region',) diff --git a/src/auf.django.emploi/auf/django/emploi/models.py b/src/auf.django.emploi/auf/django/emploi/models.py index 75d8338..36a6e96 100755 --- a/src/auf.django.emploi/auf/django/emploi/models.py +++ b/src/auf.django.emploi/auf/django/emploi/models.py @@ -8,7 +8,6 @@ import settings #from private_files import PrivateFileField import datamaster_modeles.models as ref -from project.rh.models import Poste ### CONSTANTES ### # HELP_TEXT @@ -69,13 +68,6 @@ class Metadata(models.Model): class Meta: abstract = True -class ProxyPoste(Poste): - class Meta: - proxy = True - - def __unicode__(self): - return '%s [%s]' % (self.nom, self.id) - class OffreEmploi(Metadata): est_affiche = models.BooleanField(default=False, verbose_name="En affichage sur le site") @@ -84,7 +76,7 @@ class OffreEmploi(Metadata): nom = models.CharField(max_length=255) resume = models.TextField(verbose_name="Résumé") description = tinymce_models.HTMLField() - poste = models.ForeignKey(ProxyPoste, db_column='poste') + poste = models.ForeignKey('rh.Poste', db_column='poste') date_limite = models.DateField(verbose_name="Date limite", help_text=HELP_TEXT_FORMAT_DATE,) region = models.ForeignKey(ref.Region, db_column='region', -- 1.7.10.4