Explorar o código

Fix student-teachers relationship

Andrea Fazzi %!s(int64=6) %!d(string=hai) anos
pai
achega
aafdefeaca
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      orm/student.go
  2. 1 1
      templates/students_add_update.html.tpl

+ 1 - 1
orm/student.go

@@ -42,7 +42,7 @@ type StudentForAdd struct {
 var (
 	selectStudentTeachers = `
 SELECT teachers.* FROM activities
-INNER JOIN teachers ON activities.teacher_id=teachers.id
+INNER JOIN teachers ON (activities.teacher_id=teachers.id OR activities.supply_teacher_id=teachers.id) 
 WHERE student_id=?
 `
 )

+ 1 - 1
templates/students_add_update.html.tpl

@@ -77,7 +77,7 @@
 
     <div class="form-group">
       <label class="control-label" for="class_id">Docente tutor</label>
-      <select name="tutor_id" class="form-control selectpicker" id="tutor_id" placeholder="Docente tutor" data-live-search="true" form="form_students_add_update" title="Seleziona il docente tutor" data-dropup-auto="false" required>
+      <select name="tutor_id" class="form-control selectpicker" id="tutor_id" placeholder="Docente tutor" data-live-search="true" form="form_students_add_update" title="Seleziona il docente tutor" data-dropup-auto="false">
     	<option value="0"></option>
     	{{range $teacher := .Data.AllTeachers}}
     	{{if $.Options.Get "update"}}