darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 05:29:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added a hint to show default and receives text messages

Browse Source
This commit is contained in:
Rebecca Law
2017-11-02 15:48:19 +00:00
parent 83bfc50884
commit ff22c83b1d
5 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/views/send.py
View File

@@ -192,8 +192,12 @@ def set_sender(service_id, template_id):
sender_choices=sender_context['value_and_label'],
sender_label=sender_context['description']
)
option_hints = {sender_context['default_id']: 'Default',
sender_context['receives_text_message']: 'Receives replies'}
option_hints = {sender_context['default_id']: '(Default)',
}
if sender_context.get('receives_text_message', None):
option_hints.update({sender_context['receives_text_message']: '(Receives replies)'})
if sender_context.get('default_and_receives', None):
option_hints = {sender_context['default_and_receives']: '(Default and receives replies)'}
if form.validate_on_submit():
session['sender_id'] = form.sender.data
@@ -233,8 +237,12 @@ def get_sender_context(sender_details, template_type):
context['default_id'] = next(sender['id'] for sender in sender_details if sender['is_default'])
if template_type == 'sms':
context['receives_text_message'] = next(
sender['id'] for sender in sender_details if sender['inbound_number_id'])
inbound = [sender['id'] for sender in sender_details if sender['inbound_number_id']]
if inbound:
context['receives_text_message'] = next(iter(inbound))
if context['default_id'] == context.get('receives_text_message', None):
context['default_and_receives'] = context['default_id']
context['value_and_label'] = [(sender['id'], sender[sender_format]) for sender in sender_details]
return context

2
app/main/views/service_settings.py
View File

@@ -590,7 +590,7 @@ def service_sms_senders(service_id):
if sender['is_default']:
hints += ["default"]
if sender['inbound_number_id']:
hints += ["recieves replies"]
hints += ["receives replies"]
if hints:
sender['hint'] = "(" + " and ".join(hints) + ")"