diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js
index 90c1beed..d8f3252f 100644
--- a/app/controllers/forms.server.controller.js
+++ b/app/controllers/forms.server.controller.js
@@ -165,7 +165,7 @@ exports.read = function(req, res) {
* Show the current form for rendering form live
*/
var readForRender = exports.readForRender = function(req, res) {
- var newForm = req.form.toJSON();
+ var newForm = req.form;
if (!newForm.isLive && !req.user) {
return res.status(401).send({
message: 'Form is Not Public'
@@ -257,7 +257,7 @@ exports.list = function(req, res) {
Form.find(searchObj)
.desc('created')
- .select('title', 'language', 'submissions', 'admin', 'isLive')
+ .select('title language submissions admin isLive')
.populate('admin.username', 'admin._id')
.lean()
.exec(function(err, forms) {
@@ -293,12 +293,12 @@ exports.formByID = function(req, res, next, id) {
}
else {
//Remove sensitive information from User object
- var _form = form;
- _form.admin.password = null;
- _form.admin.salt = null;
- _form.provider = null;
+ var _form = form;
+ _form.admin.password = null;
+ _form.admin.salt = null;
+ _form.provider = null;
- req.form = _form;
+ req.form = _form;
return next();
}
});
@@ -314,10 +314,10 @@ exports.formByIDFast = function(req, res, next, id) {
});
}
Form.findById(id)
- .select('title', 'language', 'form_fields', 'startPage', 'endPage', 'hideFooter', 'isLive', 'design', 'admin', 'analytics.gaCode')
- .populate()
- .cache()
+ .select('title language form_fields startPage endPage hideFooter isLive design admin analytics.gaCode')
+ .populate('admin.roles', 'admin.id')
.lean()
+ .cache()
.exec(function(err, form) {
if (err) {
return next(err);
@@ -327,13 +327,7 @@ exports.formByIDFast = function(req, res, next, id) {
});
}
else {
- //Remove sensitive information from User object
- var _form = form;
- _form.admin.password = null;
- _form.admin.salt = null;
- _form.provider = null;
-
- req.form = _form;
+ req.form = form;
return next();
}
});
diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js
index fe6eb1e3..0185ff0a 100644
--- a/app/routes/forms.server.routes.js
+++ b/app/routes/forms.server.routes.js
@@ -17,17 +17,16 @@ module.exports = function(app) {
app.route('/subdomain/:userSubdomain((?!api$)[A-Za-z0-9]+)/forms/:formId([a-zA-Z0-9]+)')
.post(forms.createSubmission);
- app.route('/subdomain/:userSubdomain((?!api$)[A-Za-z0-9]+)/forms/:formId([a-zA-Z0-9]+)/render')
+ app.route('/subdomain/:userSubdomain((?!api$)[A-Za-z0-9]+)/forms/:formIdFast([a-zA-Z0-9]+)/render')
.get(forms.readForRender);
- app.route('/forms/:formId([a-zA-Z0-9]+)/render')
- .put(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.readForRender)
+ app.route('/forms/:formIdFast([a-zA-Z0-9]+)/render')
.get(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.readForRender);
} else {
app.route('/view/')
.get(core.form);
- app.route('/forms/:formId([a-zA-Z0-9]+)/render')
+ app.route('/forms/:formIdFast([a-zA-Z0-9]+)/render')
.get(forms.readForRender);
}
app.route('/forms')
diff --git a/app/views/form.server.view.html b/app/views/form.server.view.html
index 0505da0f..8f27624f 100644
--- a/app/views/form.server.view.html
+++ b/app/views/form.server.view.html
@@ -43,7 +43,7 @@
}
-
+
-
-
-
+
+
+
+
-
+
{% for jsFile in formJSFiles %}
@@ -124,20 +119,15 @@
{% endif %}
-
-
-
+