hotfixç

parent 5f425c4b
...@@ -322,17 +322,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec ...@@ -322,17 +322,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
// Returned data from the modal window // Returned data from the modal window
modalInstance.result.then(function (pictoId) { modalInstance.result.then(function (pictoId) {
<<<<<<< HEAD
if (!pictoId)
return;
// Send the picto to the server
=======
if(!pictoId) if(!pictoId)
return; return;
// Send the picto to the server
>>>>>>> daa520803d4332af248438810e8090b1310c430c
$http.put(config.backend + '/stu/' + $scope.studentData.id + '/cat', { $http.put(config.backend + '/stu/' + $scope.studentData.id + '/cat', {
prev_id_stu_pic: picto_cat.id, prev_id_stu_pic: picto_cat.id,
new_id_pic: pictoId new_id_pic: pictoId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment