PJ ofrre emploi

diff --git a/auf/django/emploi/api.py b/auf/django/emploi/api.py
index 80cf08f..9b368c7 100644 (file)
--- a/auf/django/emploi/api.py
+++ b/auf/django/emploi/api.py
@@ -8,7 +8,7 @@ from restkit import request, Resource
 import datamaster_modeles.models as ref
 import poster
 import urllib2
-import settings
+from auf.django.emploi import settings
 
 
 STATUS_OK = 200
@@ -46,6 +46,8 @@ class API:
         url = settings.RECRUTEMENT_URLS[self.env] + "candidat_add/%s/" % offre_id
         r = Resource(url)
         params = self.request.POST
+        for k, up_file in self.request.FILES.items():
+            params[k] = up_file
         opener = poster.streaminghttp.register_openers()
         datagen, headers = poster.encode.multipart_encode(params)
         request = urllib2.Request(url, datagen, headers)
@@ -55,4 +57,3 @@ class API:
             if len(candidats) == 1: 
                 return candidats[0]
         return None
-        

diff --git a/auf/django/emploi/models.py b/auf/django/emploi/models.py
index 35a0851..306cd6e 100755 (executable)
--- a/auf/django/emploi/models.py
+++ b/auf/django/emploi/models.py
@@ -4,9 +4,8 @@ import datetime
 from django.core.files.storage import FileSystemStorage
 from tinymce import models as tinymce_models
 from django.db import models
-import settings
-
 import datamaster_modeles.models as ref
+import settings
 
 ### CONSTANTES ###
 # HELP_TEXT
@@ -147,12 +146,11 @@ class Candidat(Metadata):
 
 
 # Upload de fichiers
-storage_prive = FileSystemStorage(settings.PRIVE_MEDIA_ROOT, 
-                            base_url=settings.PRIVE_MEDIA_URL)
+storage_prive = FileSystemStorage(settings.OE_PRIVE_MEDIA_ROOT, 
+                            base_url=settings.OE_PRIVE_MEDIA_URL)
 
 def candidat_piece_dispatch(instance, filename):
-    path = u'%s/%s_%s_%s/%s/%s' % ('emplois', instance.candidat.nom, 
-        instance.candidat.prenom, instance.candidat.id, instance.nom, filename)
+    path = u'%s/%s/%s' % ('emplois', instance.candidat.id, filename)
     return path
 
 class CandidatPiece(models.Model):

diff --git a/auf/django/emploi/settings.py b/auf/django/emploi/settings.py
index 1786be2..e60179d 100644 (file)
--- a/auf/django/emploi/settings.py
+++ b/auf/django/emploi/settings.py
@@ -3,18 +3,17 @@
 import os
 from django.conf import settings
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = getattr(settings, 'OE_MEDIA_ROOT', 
-                        os.path.join(os.path.dirname(__file__), 'media'))
-PRIVE_MEDIA_ROOT = getattr(settings, 'OE_PRIV_MEDIA_ROOT', 
-                        os.path.join(os.path.dirname(__file__), 'media_prive'))
+# default
+MEDIA_ROOT = getattr(settings, 'MEDIA_ROOT', None)
+PRIVE_MEDIA_ROOT = getattr(settings, 'PRIVE_MEDIA_ROOT', None)
+MEDIA_URL = getattr(settings, 'MEDIA_URL', None)
+PRIVE_MEDIA_URL = getattr(settings, 'PRIVE_MEDIA_URL', None)
 
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = '/media/'
-PRIVE_MEDIA_URL = '/prive/'
+# custom
+OE_MEDIA_ROOT = getattr(settings, 'OE_MEDIA_ROOT', MEDIA_ROOT)
+OE_PRIVE_MEDIA_ROOT = getattr(settings, 'OE_PRIV_MEDIA_ROOT', PRIVE_MEDIA_ROOT)
+OE_MEDIA_URL = getattr(settings, 'OE_MEDIA_URL', MEDIA_URL)
+OE_PRIVE_MEDIA_URL = getattr(settings, 'OE_PRIVE_MEDIA_URL', PRIVE_MEDIA_URL)
 
 RECRUTEMENT_URLS = {'DEV': getattr(settings, 'RECRUTEMENT_URL', 'http://127.0.0.1:8000/api/'),
                     'TEST':'http://test.ressources-humaines.auf.org/api/',