Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
391ccd87
authored
Feb 23, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
comments improved from issue #956
parent
c7e70c85
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
6 deletions
sails/src/api/controllers/StudentController.js
sails/src/api/models/Student.js
sails/src/assets/scripts/modules/student/controllers/addpicto.js
sails/src/api/controllers/StudentController.js
View file @
391ccd87
...
...
@@ -849,7 +849,15 @@ module.exports = {
* legend_size: '[small]/large',
* expression: 'custom expression',
* color: any valid HEX color or [null]
* }
* },
* picto: {
* id: <pictoID>,
* source: <sourceID>,
* owner: <ownerID> or null,
* id: <pictoID>,
* uri: <URL to image>,
* category: <categoryID>
* }
* }
*/
add_picto
:
function
(
req
,
res
)
{
...
...
sails/src/api/models/Student.js
View file @
391ccd87
...
...
@@ -571,7 +571,15 @@ module.exports = {
* legend_size: '[small]/large',
* expression: 'custom expression',
* color: any valid HEX color or [null]
* }
* },
* picto: {
* id: <pictoID>,
* source: <sourceID>,
* owner: <ownerID> or null,
* id: <pictoID>,
* uri: <URL to image>,
* category: <categoryID>
* }
* }
*/
pictoInfo
:
function
(
id_stu_pic
,
cb
)
{
...
...
sails/src/assets/scripts/modules/student/controllers/addpicto.js
View file @
391ccd87
...
...
@@ -163,9 +163,9 @@ dashboardControllers.controller('AddPictoCtrl', function (
controller
:
'CropImgCtrl'
,
size
:
'lg'
,
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
()
{
...
...
@@ -198,7 +198,8 @@ dashboardControllers.controller('AddPictoCtrl', function (
$scope
.
pictos
.
push
(
picto
);
$scope
.
load_own_pictos
();
cb
();
$scope
.
close
(
picto
.
id
);
if
(
!
onlyOwn
)
$scope
.
close
(
picto
.
id
);
});
});
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment