From 04bbc2de969b8a5f46c808b16cd224185f95f0b3 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Wed, 31 May 2017 23:55:20 +0200 Subject: [PATCH] phone: don't use SSO username as an line by default (#16648) --- welco/settings.py | 2 ++ welco/sources/phone/views.py | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/welco/settings.py b/welco/settings.py index cfbfaac..1ee6d55 100644 --- a/welco/settings.py +++ b/welco/settings.py @@ -201,6 +201,8 @@ COUNTER_LINKS = [ # phone system ONE_CALL_PER_CALLEE = True MAX_CALL_DURATION = 0 # in minutes, 0 stands for infinity +# if user is from SSO, consider username as a phone line and take it +PHONELINE_TAKE_MELLON_USERNAME = False # enable/disable specific features # ex: FLAVOURS = ['alfortville'] diff --git a/welco/sources/phone/views.py b/welco/sources/phone/views.py index 2fdaac0..00160ca 100644 --- a/welco/sources/phone/views.py +++ b/welco/sources/phone/views.py @@ -52,12 +52,13 @@ class PhoneZone(TemplateView): template_name = 'welco/phone_home.html' def get_context_data(self, **kwargs): - username = self.request.session.get('mellon_session', {}).get('username') - if username: - # user is from SSO, username is a phone line (callee), create a link to it - username = username[0].split('@', 1)[0][:80] # remove realm + if settings.PHONELINE_TAKE_MELLON_USERNAME: + username = self.request.session.get('mellon_session', {}).get('username') if username: - PhoneLine.take(callee=username, user=self.request.user) + # user is from SSO, username is a phone line (callee), create a link to it + username = username[0].split('@', 1)[0][:80] # remove realm + if username: + PhoneLine.take(callee=username, user=self.request.user) context = super(PhoneZone, self).get_context_data(**kwargs) context['source_type'] = ContentType.objects.get_for_model(PhoneCall) context['phonelines'] = PhoneLine.objects.filter(users__id=self.request.user.id) -- 2.11.0