Pièces jointes et 1852:Changer les adresse hardcodé dans l'API

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index 162520a..f8a8af5 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -17,7 +17,7 @@ from recrutement.workflow import grp_evaluateurs_recrutement, \
                     grp_administrateurs_recrutement
 from recrutement.forms import *
 
-from project.lib import get_employe_from_user as get_emp
+from project.dae.utils import get_employe_from_user as get_emp
 
 class ProxyEvaluateur(Evaluateur.offres_emploi.through):
     """
@@ -66,7 +66,6 @@ class OffreEmploiAdmin(VersionAdmin):
     def get_form(self, request, obj=None, **kwargs):
         form = super(OffreEmploiAdmin, self).get_form(request, obj, **kwargs)
         employe = get_emp(request.user)
-        import pdb;pdb.set_trace()
         user_groupes = request.user.groups.all()
         if not grp_drh_recrutement in user_groupes and \
             not request.user.is_superuser:
@@ -74,7 +73,6 @@ class OffreEmploiAdmin(VersionAdmin):
                 region_field = form.declared_fields['region']
             else:
                 region_field = form.base_fields['region']
-                import pdb;pdb.set_trace()
                 user = request.user
                 region_ids = [g.id for g in user.regions.all()]
                 region_field.queryset = Region.objects.filter(id__in=region_ids)

diff --git a/project/recrutement/api.py b/project/recrutement/api.py
index 7e1e676..88001dd 100644 (file)
--- a/project/recrutement/api.py
+++ b/project/recrutement/api.py
@@ -97,11 +97,8 @@ class API:
                     if self.request.POST['candidat_piece-' + str(i) + '-nom'] is not None:
                         piece = emploi.CandidatPiece()
                         piece.candidat = candidat
-                        import pdb;pdb.set_trace()
                         piece.nom = self.request.POST['candidat_piece-' + str(i) + '-nom']
-                        import pdb;pdb.set_trace()
                         piece.path = self.request.META['QUERY_STRING']
-                        import pdb;pdb.set_trace()
                         piece.save()
 
                 evaluateurs = candidat.offre_emploi.evaluateurs.all()

diff --git a/project/recrutement/forms.py b/project/recrutement/forms.py
index 5b52584..68187df 100644 (file)
--- a/project/recrutement/forms.py
+++ b/project/recrutement/forms.py
@@ -18,6 +18,7 @@ from captcha.fields import CaptchaField
 from recrutement import models as recr
 from auf.django.emploi import forms as emploi
 from project.rh import models as rh
+from project.dae.utils import get_employe_from_user as get_emp
 
 ################################################################################
 # EVALUATION

diff --git a/src/auf.django.emploi/auf/django/emploi/api.py b/src/auf.django.emploi/auf/django/emploi/api.py
index 1fc1987..9e9d815 100644 (file)
--- a/src/auf.django.emploi/auf/django/emploi/api.py
+++ b/src/auf.django.emploi/auf/django/emploi/api.py
@@ -12,6 +12,7 @@ import datamaster_modeles.models as ref
 from poster.encode import MultipartParam
 from poster.encode import multipart_encode
 import urllib2
+import settings
 
 
 STATUS_OK = '200 OK'
@@ -20,8 +21,12 @@ class API:
     def __init__(self, request):
         self.request = request
 
-    def offre_emploi_liste(self):
-        url = "http://127.0.0.1:8000/api/offre_emploi_liste/"
+    def offre_emploi_liste(self, env):
+
+        if hasattr(settings, "RECRUTEMENT_URL"):
+            url = getattr(settings, "RECRUTEMENT_URL")[env] + "offre_emploi_liste/"
+        else:
+            raise ImportError, "Could not import settings RECRUTEMENT_PATH"
         r = req(url)
         liste_json = r.body_string()
         try:
@@ -48,9 +53,12 @@ class API:
             obj_offres_emploi.append(offre)  
         return obj_offres_emploi
 
-    def offre_emploi(self, offre_id):
-        url = "http://127.0.0.1:8000/api/offre_emploi/?id=%s"
-        r = req(url % (offre_id))
+    def offre_emploi(self, offre_id, env):
+        if hasattr(settings, "RECRUTEMENT_URL"):
+            url = getattr(settings, "RECRUTEMENT_URL")[env] + "offre_emploi/?id=%s"
+        else:
+            raise ImportError, "Could not import settings RECRUTEMENT_PATH"
+        r = req(url % offre_id)
         offre_json = r.body_string()
 
         try:
@@ -76,14 +84,14 @@ class API:
         obj_offres_emploi.append(offre)
         return obj_offres_emploi
 
-    def candidat_add(self, offre_id):
-        url = "http://127.0.0.1:8000/api/candidat_add/%s" % offre_id
-        r = Resource(url)
-        import pdb;pdb.set_trace()
+    def candidat_add(self, offre_id, env):
+        if hasattr(settings, "RECRUTEMENT_URL"):
+            url = getattr(settings, "RECRUTEMENT_URL")[env] + "candidat_add/%s"
+        else:
+            raise ImportError, "Could not import settings RECRUTEMENT_PATH"
+        r = Resource(url % offre_id)
         mp = MultipartParam.from_file('cv', self.request.POST.get('candidat_piece-0-nom'))
-        import pdb;pdb.set_trace()
         datagen, headers = multipart_encode([image_param])
-        import pdb;pdb.set_trace()
         resp = r.post(payload=self.request.FILES, params_dict=self.request.POST)
         if resp.status == STATUS_OK:
             candidat_id = simplejson.loads(resp.body_string())['candidat_id']

diff --git a/src/auf.django.emploi/auf/django/emploi/settings.py b/src/auf.django.emploi/auf/django/emploi/settings.py
index 101b2a1..0772d21 100644 (file)
--- a/src/auf.django.emploi/auf/django/emploi/settings.py
+++ b/src/auf.django.emploi/auf/django/emploi/settings.py
@@ -15,3 +15,7 @@ PRIVE_MEDIA_ROOT = getattr(settings, 'OE_PRIV_MEDIA_ROOT',
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = '/media/'
 PRIVE_MEDIA_URL = '/prive/'
+
+RECRUTEMENT_URL = {'DEV':'http://127.0.0.1:8000/api/',
+                    'TEST':'http://test.ressources-humaines.auf.org/api/',
+                    'PROD':'http://ressources-humaines.auf.org/api/',}