Ver código fonte

Merge branch 'master' of https://gogs.carducci-dante.gov.it/karmen/core

Andrea Fazzi 6 anos atrás
pai
commit
5c6cd19399
2 arquivos alterados com 3 adições e 3 exclusões
  1. 1 1
      orm/orm_test.go
  2. 2 2
      orm/student.go

+ 1 - 1
orm/orm_test.go

@@ -295,7 +295,7 @@ func (t *testSuite) TestSaveStudent() {
 
 	if !t.Failed() {
 		student, _ = GetStudent(map[string]string{"id": "1"})
-		t.Equal(uint(1), student.(*Student).ClassID)
+		t.Equal(uint(2), student.(*Student).ClassID)
 		t.Equal(true, student.(*Student).Handicap)
 	}
 }

+ 2 - 2
orm/student.go

@@ -43,6 +43,7 @@ var (
 	selectStudentTeachers = `
 SELECT teachers.* FROM activities
 INNER JOIN teachers ON activities.teacher_id=teachers.id
+WHERE student_id=?
 `
 )
 
@@ -103,7 +104,6 @@ func GetStudentsAll(args map[string]string) (interface{}, error) {
 }
 
 func SaveStudent(student interface{}) (interface{}, error) {
-
 	if err := DB().Omit("Class", "Tutor", "Teachers", "Activities").Save(student).Error; err != nil {
 		return nil, err
 	}
@@ -210,7 +210,7 @@ func GetStudentForAdd(args map[string]string) (interface{}, error) {
 }
 
 func (s *Student) GetTeachers() ([]*Teacher, error) {
-	if err := DB().Raw(selectStudentTeachers).Scan(&s.Teachers).Error; err != nil {
+	if err := DB().Raw(selectStudentTeachers, s.ID).Scan(&s.Teachers).Error; err != nil {
 		return nil, err
 	}
 	return s.Teachers, nil