entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

agoraplus: fix adult id retrieval from sas (#11241)

This commit is contained in:
Serghei Mihai 2016-06-07 17:54:35 +02:00
parent 96e6c5df69
commit 343706e89a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
passerelle/contrib/agoraplus/models.py
View File

@ -794,23 +794,23 @@ class AgoraPlus(BaseResource):
raise Exception((res.get('message') or '').encode('utf-8'))
return True
def get_agoraplus_adult_id(self, adult_id, login):
def get_agoraplus_adult_id(self, adult_id, login, name_id):
if not adult_id.startswith('sas_'):
return adult_id
family = self.get_family(login=login)
family = self.get_family(login=login, name_id=name_id)
for adult in family['adults']:
if adult_id == adult['id']:
return adult['original_id']
raise ObjectDoesNotExist(_('adult not in Agora+'))
def update_phone_numbers(self, login, adult_id,
def update_phone_numbers(self, login, name_id, adult_id,
new_phone_number, new_cellphone_number):
family = self.get_agoraplus_family(login)
if not family:
raise ObjectDoesNotExist(_('no family in Agora+'))
# get adult infos
agoraplus_adult_id = self.get_agoraplus_adult_id(adult_id, login)
agoraplus_adult_id = self.get_agoraplus_adult_id(adult_id, login, name_id)
endpoint = 'familles/%s/representants/%s' % (family['id'], agoraplus_adult_id)
adult_data = self.request(endpoint)
adult_data['fixPerso'] = new_phone_number
@ -822,14 +822,14 @@ class AgoraPlus(BaseResource):
raise Exception((res.get('message') or '').encode('utf-8'))
return True
def update_profession(self, login, adult_id, new_profession,
def update_profession(self, login, name_id, adult_id, new_profession,
new_pcs, new_employer_name, new_employer_city, new_employer_phone):
family = self.get_agoraplus_family(login)
if not family:
raise ObjectDoesNotExist('no family in Agora+')
# get adult infos
agoraplus_adult_id = self.get_agoraplus_adult_id(adult_id, login)
agoraplus_adult_id = self.get_agoraplus_adult_id(adult_id, login, name_id)
endpoint = 'familles/%s/representants/%s' % (family['id'], agoraplus_adult_id)
adult_data = self.request(endpoint)
adult_data['employeur'] = new_employer_name

4
passerelle/contrib/agoraplus/views.py
View File

@ -593,7 +593,7 @@ class PhoneUpdateView(PostFormdataView):
new_phone_number = formdata.get('phone')
new_cellphone_number = formdata.get('cellphone')
try:
return self.object.update_phone_numbers(self.login, adult_id,
return self.object.update_phone_numbers(self.login, self.name_id, adult_id,
new_phone_number, new_cellphone_number)
except ObjectDoesNotExist, e:
raise Http404(e.message)
@ -608,7 +608,7 @@ class ProfessionUpdateView(PostFormdataView):
new_employer_city = formdata.get('employer_city')
new_employer_phone = formdata.get('employer_phone')
try:
return self.object.update_profession(self.login, adult_id,
return self.object.update_profession(self.login, self.name_id, adult_id,
new_profession, new_pcs, new_employer_name,
new_employer_city, new_employer_phone)
except ObjectDoesNotExist, e: