zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-02 22:21:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Various UX audit fixes

Browse Source
This commit is contained in:
Michael Abashian
2016-06-21 17:29:08 -04:00
parent 06c74ced76
commit d3d7cf20a2
10 changed files with 148 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@@ -54,25 +54,36 @@ export default
master[fld] = data[fld];
}
if(data.notification_configuration[fld]){
$scope[fld] = data.notification_configuration[fld];
master[fld] = data.notification_configuration[fld];
if(form.fields[fld].type === 'textarea'){
if (form.fields[fld].name === 'headers') {
$scope[fld] = JSON.stringify($scope[fld], null, 2);
} else {
$scope[fld] = $scope[fld].toString().replace(',' , '\n');
if(form.fields[fld].type === 'checkbox_group') {
// Loop across the group and put the child data on scope
for(var j=0; j<form.fields[fld].fields.length; j++) {
if(data.notification_configuration[form.fields[fld].fields[j].name]) {
$scope[form.fields[fld].fields[j].name] = data.notification_configuration[form.fields[fld].fields[j].name];
master[form.fields[fld].fields[j].name] = data.notification_configuration[form.fields[fld].fields[j].name];
}
}
}
else {
if(data.notification_configuration[fld]){
$scope[fld] = data.notification_configuration[fld];
master[fld] = data.notification_configuration[fld];
if (form.fields[fld].sourceModel && data.summary_fields &&
data.summary_fields[form.fields[fld].sourceModel]) {
$scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
if(form.fields[fld].type === 'textarea'){
if (form.fields[fld].name === 'headers') {
$scope[fld] = JSON.stringify($scope[fld], null, 2);
} else {
$scope[fld] = $scope[fld].toString().replace(',' , '\n');
}
}
}
if (form.fields[fld].sourceModel && data.summary_fields &&
data.summary_fields[form.fields[fld].sourceModel]) {
$scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
data.summary_fields[form.fields[fld].sourceModel][form.fields[fld].sourceField];
}
}
}
data.notification_type = (Empty(data.notification_type)) ? '' : data.notification_type;
@@ -153,8 +164,19 @@ export default
$scope.typeChange = function () {
for(var fld in form.fields){
if(form.fields[fld] && form.fields[fld].subForm){
$scope[fld] = null;
$scope.notification_template_form[fld].$setPristine();
if(form.fields[fld].type === 'checkbox_group' && form.fields[fld].fields) {
// Need to loop across the groups fields to null them out
for(var i=0; i<form.fields[fld].fields.length; i++) {
// Pull the name out of the object (array of objects)
var subFldName = form.fields[fld].fields[i].name;
$scope[subFldName] = null;
$scope.notification_template_form[subFldName].$setPristine();
}
}
else {
$scope[fld] = null;
$scope.notification_template_form[fld].$setPristine();
}
}
}
@@ -208,6 +230,14 @@ export default
.filter(i => (form.fields[i].ngShow && form.fields[i].ngShow.indexOf(v) > -1))
.map(i => [i, processValue($scope[i], i , form.fields[i])]));
delete params.notification_configuration.checkbox_group;
for(var j = 0; j < form.fields.checkbox_group.fields.length; j++) {
if(form.fields.checkbox_group.fields[j].ngShow && form.fields.checkbox_group.fields[j].ngShow.indexOf(v) > -1) {
params.notification_configuration[form.fields.checkbox_group.fields[j].name] = Boolean($scope[form.fields.checkbox_group.fields[j].name]);
}
}
Wait('start');
Rest.setUrl(url+ id+'/');
Rest.put(params)