From fa47643b0122a9d6b12e96014836d4e6fb5533d9 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 13 May 2016 11:13:09 -0700 Subject: [PATCH] added back form list view --- app/controllers/forms.server.controller.js | 4 +--- app/routes/forms.server.routes.js | 6 +++++- public/application.js | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index fc52cbb1..a117a3dc 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -362,13 +362,11 @@ exports.list = function(req, res) { * Form middleware */ exports.formByID = function(req, res, next, id) { - if (!mongoose.Types.ObjectId.isValid(id)) { return res.status(400).send({ message: 'Form is invalid' }); - } - else { + } else { Form.findById(id).populate('admin').exec(function(err, form) { if (err) { return next(err); diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js index d515338c..4ba1ab4d 100644 --- a/app/routes/forms.server.routes.js +++ b/app/routes/forms.server.routes.js @@ -29,10 +29,14 @@ module.exports = function(app) { app.route('/upload/pdf') .post(users.requiresLogin, upload.single('file'), forms.uploadPDF); - //TODO: Need to finish this + //TODO: Need to finish this for file upload field //app.route('/forms/:formId([a-zA-Z0-9]+)/upload') // .post(forms.uploadSubmissionFile); + app.route('/forms') + .get(users.requiresLogin, forms.list) + .post(users.requiresLogin, forms.create); + app.route('/forms/:formId([a-zA-Z0-9]+)') .get(forms.read) .post(forms.createSubmission) diff --git a/public/application.js b/public/application.js index ca0b4ca1..6423c3e9 100755 --- a/public/application.js +++ b/public/application.js @@ -15,13 +15,13 @@ angular.module(ApplicationConfiguration.applicationModuleName).constant('APP_PER viewAdminSettings: 'viewAdminSettings', editAdminSettings: 'editAdminSettings', editForm: 'editForm', - viewPrivateForm: 'viewPrivateForm', + viewPrivateForm: 'viewPrivateForm' }); //User Role constants angular.module(ApplicationConfiguration.applicationModuleName).constant('USER_ROLES', { admin: 'admin', normal: 'user', - superuser: 'superuser', + superuser: 'superuser' }); angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', '$state', '$stateParams',