comments improved from issue #956

parent c7e70c85
...@@ -849,6 +849,14 @@ module.exports = { ...@@ -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>
* } * }
* } * }
*/ */
......
...@@ -571,6 +571,14 @@ module.exports = { ...@@ -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>
* } * }
* } * }
*/ */
......
...@@ -163,9 +163,9 @@ dashboardControllers.controller('AddPictoCtrl', function ( ...@@ -163,9 +163,9 @@ dashboardControllers.controller('AddPictoCtrl', function (
controller: 'CropImgCtrl', controller: 'CropImgCtrl',
size: 'lg', size: 'lg',
resolve: { resolve: {
picFile: () => {return $scope.picFile;}, picFile: () => {return $scope.picFile},
uploadFunc: () => {return $scope.upload;}, uploadFunc: () => {return $scope.upload},
progress: () => {return $scope.progress;} progress: () => {return $scope.progress}
} }
}); });
modalInstance.result.then(function () { modalInstance.result.then(function () {
...@@ -198,6 +198,7 @@ dashboardControllers.controller('AddPictoCtrl', 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);
}); });
}); });
......
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