Skip to content

yotta / pictogram

Go to a project
Commit 2b97af66 by Sebastián Collado Montañez
Options

hotfixç

parent 5f425c4b
Inline Side-by-side
Showing with 0 additions and 8 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
......@@ -322,17 +322,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
// Returned data from the modal window
modalInstance.result.then(function (pictoId) {
<<<<<<< HEAD
if (!pictoId)
return;
// Send the picto to the server
=======
if(!pictoId)
return;
// Send the picto to the server
>>>>>>> daa520803d4332af248438810e8090b1310c430c
$http.put(config.backend + '/stu/' + $scope.studentData.id + '/cat', {
prev_id_stu_pic: picto_cat.id,
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