From 62ea5c4948e061b7730cdf661db61e953a63e55d Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Tue, 3 Nov 2015 12:28:13 -0800 Subject: [PATCH 1/3] reverted changes back --- app/controllers/forms.server.controller.js | 2 +- app/models/form.server.model.js | 2 +- app/models/form_field.server.model.js | 1 - app/models/form_submission.server.model.js | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index 6695d55b..bda00b1c 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -7,7 +7,7 @@ var mongoose = require('mongoose'), errorHandler = require('./errors.server.controller'), Form = mongoose.model('Form'), FormSubmission = mongoose.model('FormSubmission'), - pdfFiller = require('node-pdffiller'), + pdfFiller = require('pdffiller'), config = require('../../config/config'), fs = require('fs-extra'), async = require('async'), diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index fedd3729..7c555d9c 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -5,7 +5,7 @@ */ var mongoose = require('mongoose'), Schema = mongoose.Schema, - pdfFiller = require('node-pdffiller'), + pdfFiller = require('pdffiller'), _ = require('lodash'), config = require('../../config/config'), path = require('path'), diff --git a/app/models/form_field.server.model.js b/app/models/form_field.server.model.js index 02ee0fbb..10eba16b 100644 --- a/app/models/form_field.server.model.js +++ b/app/models/form_field.server.model.js @@ -4,7 +4,6 @@ * Module dependencies. */ var mongoose = require('mongoose'), - relationship = require('mongoose-relationship'), mUtilities = require('mongoose-utilities'), _ = require('lodash'), Schema = mongoose.Schema; diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js index ffeddde9..d6a74082 100644 --- a/app/models/form_submission.server.model.js +++ b/app/models/form_submission.server.model.js @@ -5,7 +5,7 @@ */ var mongoose = require('mongoose'), Schema = mongoose.Schema, - pdfFiller = require('node-pdffiller'), + pdfFiller = require('pdffiller'), satelize = require('satelize'), _ = require('lodash'), config = require('../../config/config'), From 4546f3418dfa8e8cd495542a038e1ecde094c445 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Tue, 3 Nov 2015 12:36:27 -0800 Subject: [PATCH 2/3] fixed intercepted error --- public/modules/users/config/users.client.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/users/config/users.client.config.js b/public/modules/users/config/users.client.config.js index 2b5eb63c..2ab982e0 100755 --- a/public/modules/users/config/users.client.config.js +++ b/public/modules/users/config/users.client.config.js @@ -7,7 +7,7 @@ angular.module('users').config(['$httpProvider', return { responseError: function(response) { // console.log($location.path()); - if( $location.path() !== '/users/me' && response.config){ + if( $location.path() !== '/users/me' && $location.path() !== '/forms' && response.config){ if(response.config.url !== '/users/me'){ console.log('intercepted rejection of ', response.config.url, response.status); if (response.status === 401) { From 40c1b257038efe54e20294be464763e1b6695c35 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Tue, 3 Nov 2015 12:44:55 -0800 Subject: [PATCH 3/3] fixed intercepted error --- public/modules/users/config/users.client.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/users/config/users.client.config.js b/public/modules/users/config/users.client.config.js index 2ab982e0..7cd948ea 100755 --- a/public/modules/users/config/users.client.config.js +++ b/public/modules/users/config/users.client.config.js @@ -7,7 +7,7 @@ angular.module('users').config(['$httpProvider', return { responseError: function(response) { // console.log($location.path()); - if( $location.path() !== '/users/me' && $location.path() !== '/forms' && response.config){ + if( ($location.path() !== '/users/me' || $location.path() !== '/forms') && response.config){ if(response.config.url !== '/users/me'){ console.log('intercepted rejection of ', response.config.url, response.status); if (response.status === 401) {