comments improved from issue #956

sails/src/api/controllers/StudentController.js

@@ -849,6 +849,14 @@ module.exports = {
    *       legend_size: '[small]/large',
    *       legend_size: '[small]/large',
    *       expression: 'custom expression',
    *       expression: 'custom expression',
    *       color: any valid HEX color or [null]
    *       color: any valid HEX color or [null]
+   *     },
+   *     picto: {
+     *     id: <pictoID>,
+     *     source: <sourceID>,
+     *     owner: <ownerID> or null,
+     *     id: <pictoID>,
+     *     uri: <URL to image>,
+     *     category: <categoryID>
      *    }
      *    }
    *   }
    *   }
    */
    */

sails/src/api/models/Student.js

@@ -571,6 +571,14 @@ module.exports = {
   *     legend_size: '[small]/large',
   *     legend_size: '[small]/large',
   *     expression: 'custom expression',
   *     expression: 'custom expression',
   *     color: any valid HEX color or [null]
   *     color: any valid HEX color or [null]
+  *  },
+  *  picto: {
+  *     id: <pictoID>,
+  *     source: <sourceID>,
+  *     owner: <ownerID> or null,
+  *     id: <pictoID>,
+  *     uri: <URL to image>,
+  *     category: <categoryID>
   *    }
   *    }
   * }
   * }
   */
   */

sails/src/assets/scripts/modules/student/controllers/addpicto.js

@@ -163,9 +163,9 @@ dashboardControllers.controller('AddPictoCtrl', function (
       controller: 'CropImgCtrl',
       controller: 'CropImgCtrl',
       size: 'lg',
       size: 'lg',
       resolve: {
       resolve: {
-        picFile: () => {return $scope.picFile;},
-        uploadFunc: () => {return $scope.upload;},
-        progress: () => {return $scope.progress;}
+        picFile: () => {return $scope.picFile},
+        uploadFunc: () => {return $scope.upload},
+        progress: () => {return $scope.progress}
       }
       }
     });
     });
     modalInstance.result.then(function () {
     modalInstance.result.then(function () {
@@ -198,6 +198,7 @@ dashboardControllers.controller('AddPictoCtrl', function (
             $scope.pictos.push(picto);
             $scope.pictos.push(picto);
             $scope.load_own_pictos();
             $scope.load_own_pictos();
             cb();
             cb();
+            if (!onlyOwn)
               $scope.close(picto.id);
               $scope.close(picto.id);
           });
           });
         });
         });