diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 16:18:05 +0100 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 16:18:05 +0100 |
| commit | 9d5891a60b46bc5666974c521d2cb0f7c003b42f (patch) | |
| tree | 287e8699f3b5aa524d666ec164ae860c34b8dc64 /src | |
| parent | 813904f035b612a9c61caba97d54f8a803f5a69c (diff) | |
| download | esper-testing-9d5891a60b46bc5666974c521d2cb0f7c003b42f.tar.gz esper-testing-9d5891a60b46bc5666974c521d2cb0f7c003b42f.tar.bz2 esper-testing-9d5891a60b46bc5666974c521d2cb0f7c003b42f.tar.xz esper-testing-9d5891a60b46bc5666974c521d2cb0f7c003b42f.zip | |
o Fixing so that it queries builds based on created_date and not timestamp.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java | 2 | ||||
| -rwxr-xr-x | src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java index d21118d..46fdc29 100755 --- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java +++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java @@ -174,7 +174,7 @@ public class JenkinsDao { public List<JenkinsBuildDto> selectBuildByJob(UUID job, PageRequest page) throws SQLException { String sql = "SELECT " + JENKINS_BUILD + " FROM jenkins_build WHERE job=?"; - sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date", "timestamp"); + sql += orderBy(ifEmpty(page.orderBy, "created_date-"), "created_date"); sql += " LIMIT ? OFFSET ?"; try (PreparedStatement s = c.prepareStatement(sql)) { diff --git a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js index 68344cd..7d0a90c 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js +++ b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js @@ -32,7 +32,7 @@ function JobCtrl($scope, $location, $routeParams, JenkinsJob, JenkinsBuild, Pagi $scope.details = details; }); - $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {job: $scope.jobUuid, orderBy: "timestamp-"})); + $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {job: $scope.jobUuid, orderBy: "created_date-"})); } function BuildCtrl($scope, $location, $routeParams, JenkinsBuild) { |