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
b7d121b4
authored
Aug 14, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on issue
#305
parent
ce23981e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
sails/src/api/controllers/SupervisorController.js
sails/src/api/models/Supervisor.js
sails/src/api/controllers/SupervisorController.js
View file @
b7d121b4
...
...
@@ -652,8 +652,7 @@ module.exports = {
*/
students
:
function
(
req
,
res
)
{
if
(
!
req
.
params
.
id
)
{
return
res
.
json
(
500
,
{
error
:
'No supervisor defined'
return
res
.
badRequest
(
'No supervisor defined'
);
});
}
Supervisor
.
students
(
req
.
params
.
id
,
function
(
err
,
stus
)
{
...
...
@@ -670,7 +669,7 @@ module.exports = {
return
res
.
badRequest
();
Supervisor
.
commonStudents
(
req
.
params
.
id_sup
,
req
.
params
.
id_off
,
function
(
err
,
stus
)
{
if
(
err
)
throw
err
;
if
(
err
)
return
res
.
serverError
(
err
)
;
return
res
.
ok
(
stus
);
});
},
...
...
sails/src/api/models/Supervisor.js
View file @
b7d121b4
...
...
@@ -240,7 +240,7 @@ module.exports = {
})
.
spread
(
function
(
sup
,
stuSups
)
{
if
(
!
stuSups
||
stuSups
.
length
==
0
)
return
throw
new
Error
(
"No students"
);
throw
new
Error
(
"No students"
);
async
.
eachSeries
(
stuSups
,
function
(
stuSup
,
next_cb
)
{
// set current method and instruction if any
Student
.
findOne
(
stuSup
.
student
.
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