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

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

Browse source
This commit is contained in:
David Baldwynn 2017-10-28 01:51:18 -07:00
parent 3b9f01f92a dc3bb54774
commit a3d203fee3
5 changed files with 287 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,15 +125,7 @@ exports.read = function(req, res) {
if(!req.user || (req.form.admin.id !== req.user.id) ){
readForRender(req, res);
} else {
FormSubmission.find({ form: req.form._id }).exec(function(err, _submissions) {
if (err) {
res.status(400).send({
message: errorHandler.getErrorMessage(err)
});
}
var newForm = req.form.toJSON();
newForm.submissions = _submissions;
if (req.userId) {
if(req.form.admin._id+'' === req.userId+''){
@ -144,7 +136,6 @@ exports.read = function(req, res) {
});
}
return res.json(newForm);
});
}
};

554
public/dist/application.js vendored
View file

File diff suppressed because it is too large Load diff

4
public/dist/application.min.css vendored
View file

File diff suppressed because one or more lines are too long

12
public/dist/application.min.js vendored
View file

File diff suppressed because one or more lines are too long

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

@ -19,7 +19,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
var initController = function(){
$http({
method: 'GET',
url: '/forms'+$scope.myform._id+'/submissions'
url: '/forms/'+$scope.myform._id+'/submissions'
}).then(function successCallback(response) {
var defaultFormFields = _.cloneDeep($scope.myform.form_fields);