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

allow form to be embedded

Browse source
This commit is contained in:
David Baldwynn 2016-07-04 16:59:37 -07:00
parent 77893b0c4e
commit 89b10232c5
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/core.server.controller.js
View file

@ -13,6 +13,9 @@ exports.index = function(req, res) {
}; };
exports.form = function(req, res) { exports.form = function(req, res) {
//Allow form to be embeded
res.removeHeader('X-Frame-Options');
res.render('form', { res.render('form', {
user: req.user || null, user: req.user || null,
request: req request: req

13
app/controllers/forms.server.controller.js
View file

@ -285,10 +285,6 @@ exports.read = function(req, res) {
var newForm = req.form.toJSON({virtuals : true}); var newForm = req.form.toJSON({virtuals : true});
newForm.plugins.oscarhost.settings.validUpdateTypes = validUpdateTypes; newForm.plugins.oscarhost.settings.validUpdateTypes = validUpdateTypes;
if(newForm){
return res.json(newForm);
}
if (req.userId) { if (req.userId) {
if(req.form.admin._id+'' === req.userId+''){ if(req.form.admin._id+'' === req.userId+''){
return res.json(newForm); return res.json(newForm);
@ -296,14 +292,9 @@ exports.read = function(req, res) {
return res.status(404).send({ return res.status(404).send({
message: 'Form Does Not Exist' message: 'Form Does Not Exist'
}); });
}else {
if(newForm) return res.json(newForm);
} }
return res.json(newForm);
/*return res.status(404).send({
message: 'Form Does Not Exist'
});*/
}; };
/** /**

4
app/routes/forms.server.routes.js
View file

@ -29,10 +29,6 @@ module.exports = function(app) {
app.route('/upload/pdf') app.route('/upload/pdf')
.post(users.requiresLogin, upload.single('file'), forms.uploadPDF); .post(users.requiresLogin, upload.single('file'), forms.uploadPDF);
//TODO: Need to finish this for file upload field
//app.route('/forms/:formId([a-zA-Z0-9]+)/upload')
// .post(forms.uploadSubmissionFile);
app.route('/forms') app.route('/forms')
.get(users.requiresLogin, forms.list) .get(users.requiresLogin, forms.list)
.post(users.requiresLogin, forms.create); .post(users.requiresLogin, forms.create);