External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 04:10:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2081 from leigh-johnson/HipChatAddEdit

Browse Source 
Fix adding/editing of HipChat notification templates
This commit is contained in:
Akita Noek 2016-05-31 16:39:49 -04:00
commit ba78427fef
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@ -141,7 +141,23 @@ export default function() {
reqExpression: "channel_required",
init: "false"
},
ngShow: "notification_type.value == 'slack' || notification_type.value == 'hipchat'",
ngShow: "notification_type.value == 'slack'",
subForm: 'typeSubForm'
},
rooms: {
label: 'Destination Channels',
type: 'textarea',
rows: 3,
awPopOver: '<p>Type an option on each line. The pound symbol (#) is not required.</p>'+
'<p>For example:<br>engineering<br>\n #support<br>\n',
dataTitle: 'Destination Channels',
dataPlacement: 'right',
dataContainer: "body",
awRequiredWhen: {
reqExpression: "room_required",
init: "false"
},
ngShow: "notification_type.value == 'hipchat'",
subForm: 'typeSubForm'
},
token: {
@ -265,11 +281,7 @@ export default function() {
},
notify: {
label: 'Notify Channel',
type: 'text',
awRequiredWhen: {
reqExpression: "hipchat_required",
init: "false"
},
type: 'checkbox',
ngShow: "notification_type.value == 'hipchat' ",
subForm: 'typeSubForm'
},

2
awx/ui/client/src/notifications/shared/type-change.service.js
View File

@ -39,7 +39,7 @@ function () {
case 'hipchat':
obj.tokenLabel = ' Token';
obj.hipchat_required = true;
obj.channel_required = true;
obj.room_required = true;
obj.token_required = true;
break;
case 'twilio':