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

merged changes

Browse source
This commit is contained in:
David Baldwynn 2016-07-05 18:52:54 -07:00
parent d6c3aebe65 34dca69d6e
commit 8ae36973e8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/modules/forms/admin/controllers/admin-form.client.controller.js
View file

@ -107,7 +107,11 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
console.log(diffChanges);
<<<<<<< HEAD
$scope.updatePromise = $http.put('/forms/'+$scope.myform._id, { changes: diffChanges })
=======
$scope.updatePromise = $http.put('/forms/'+$scope.myform._id, { form: $scope.myform, changes: diffChanges })
>>>>>>> 34dca69d6e91b25f91b8b28b135aec00858dcd98
.then(function(response){
$rootScope.myform = $scope.myform = response.data;
// console.log(response.data);