updated application.js

This commit is contained in:
David Baldwynn 2015-11-12 18:27:45 -08:00
parent 0d1e76e8ea
commit 23dced3edf
3 changed files with 11 additions and 7 deletions

View file

@ -386,8 +386,12 @@ angular.module('forms').run(['Menus',
var valid_count = fields.filter(function(field){
if(typeof field === 'object'){
return !!(field.fieldValue) || _.isNumber(field.fieldValue);
if(field.fieldType === 'rating' || field.fieldType === 'statement'){
return true;
}
return !!(field.fieldValue);
}
}).length;
return valid_count - (formObj.form_fields.length - formObj.visible_form_fields.length);
}
@ -569,9 +573,8 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
continueUpdate = !$rootScope.saveInProgress;
}
//Update form if we **are not currently updating** or if **shouldUpdateNow flag is set**
//Update form **if we are not currently updating** or if **shouldUpdateNow flag is set**
if(continueUpdate){
// console.log('begin updating form');
var err = null;
if(!updateImmediately){ $rootScope.saveInProgress = true; }
@ -1045,7 +1048,8 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
};
$scope.duplicateField = function (field_index){
var currField = _.cloneDeep($scope.myform.form_fields[field_index]);
currField._id = '';
currField._id = 'cloned'+_.uniqueId();
currField.title += ' copy';
//Insert field at selected index
$scope.myform.form_fields.splice(field_index+1, 0, currField);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long