beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:whitef0x0/tellform

Browse source
This commit is contained in:
David Baldwynn 2016-11-14 14:14:25 -05:00 committed by David Baldwynn
parent a24b8281d6 3b0af059d2
commit 601dcd64e4
3 changed files with 101 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/form.server.model.js
View file

@ -231,7 +231,7 @@ FormSchema.virtual('analytics.fields').get(function () {
}
return sum;
}, 0);
}else {
} else {
continueViews = _.reduce(visitors, function(sum, visitorObj){
if(visitorObj.lastActiveField+'' === field._id+'' && visitorObj.isSubmitted){
return sum + 1;
@ -293,13 +293,9 @@ FormSchema.pre('save', function (next) {
return cb(err);
} else {
_original = original;
//console.log('_original');
//console.log(_original);
return cb(null);
}
});
}, function(cb) {
return cb(null);
},
function(cb) {
var hasIds = true;

1
public/dist/application.js vendored
View file

@ -2256,7 +2256,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
$scope.addNewLogicJump = function (field_index) {
var form_fields = $scope.myform.form_fields;
var currField = form_fields[field_index];
console.log(currField);
if (form_fields.length > 1 && currField._id) {
var newLogicJump = {

5
public/modules/forms/admin/directives/edit-form.client.directive.js
View file

@ -61,14 +61,13 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
// LOGIC JUMP METHODS
$scope.removeLogicJump = function (field_index) {
var currField = $scope.myform.form_fields[field_index];
currField.logicJump = {};
$scope.myform.form_fields[field_index].logicJump.fieldA = null;
$scope.myform.form_fields[field_index].logicJump.valueB = null;
};
$scope.addNewLogicJump = function (field_index) {
var form_fields = $scope.myform.form_fields;
var currField = form_fields[field_index];
console.log(currField);
if (form_fields.length > 1 && currField._id) {
var newLogicJump = {