Skip to content

Commit

Permalink
Merge pull request #634 from nvidela/actas_lvm
Browse files Browse the repository at this point in the history
cambios en actas lvm
  • Loading branch information
nvidela authored Nov 19, 2020
2 parents fd7ee79 + 825cba7 commit 0a0ce2f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
3.6.6
3.6.7

4 changes: 2 additions & 2 deletions lib/model/DivisionPeer.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static function retrieveStudentSchoolYearDivisions($school_year, $student
$criteria->addJoin(self::ID, DivisionStudentPeer::DIVISION_ID);
$criteria->add(DivisionStudentPeer::STUDENT_ID, $student->getId());
$criteria->addAscendingOrderByColumn(self::YEAR);

$criteria->addAscendingOrderByColumn(DivisionPeer::DIVISION_TITLE_ID);
return self::doSelect($criteria);

}
Expand Down Expand Up @@ -211,4 +211,4 @@ static public function sortedJoinWithPreceptor($c, $sf_user)
}


}
}

0 comments on commit 0a0ce2f

Please sign in to comment.