From cdb6836061d615dd67db4d26e408ed08576984de Mon Sep 17 00:00:00 2001 From: Jessica Dussault Date: Tue, 12 May 2020 12:46:56 -0500 Subject: [PATCH 1/2] fixes pagination bug where page 2 of search errors I'm guessing this was introduced here: https://github.com/CDRH/orchid/commit/4079e0067b6129789300c869c1702169280c1623 but I am impressed we didn't notice until now --- CHANGELOG.md | 3 +++ app/views/items/_paginator.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30b43cc1..1d4fcd2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- bug with search pagination + ## [v3.0.2](https://github.com/CDRH/orchid/compare/v3.0.1...v3.0.2) - html_classes for styling and minor fixes ### Added diff --git a/app/views/items/_paginator.html.erb b/app/views/items/_paginator.html.erb index a7119bf9..f0df6462 100644 --- a/app/views/items/_paginator.html.erb +++ b/app/views/items/_paginator.html.erb @@ -31,7 +31,7 @@ rel: "nofollow", "aria-label": "First Page" %> <%# don't display dots between 1 and 2 %> - <% if pages_prior.min > 2 %> + <% if pages_prior.present? && pages_prior.min > 2 %>
  • <% end %> <% end %> From da03bd4e781bda5cf2108964db9482f96696a33f Mon Sep 17 00:00:00 2001 From: Jessica Dussault Date: Tue, 12 May 2020 13:02:31 -0500 Subject: [PATCH 2/2] preps for release --- CHANGELOG.md | 2 ++ lib/orchid/version.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d4fcd2b..426b6957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v3.0.3](https://github.com/CDRH/orchid/compare/v3.0.2...v3.0.3) - pagination bugfix + ### Fixed - bug with search pagination diff --git a/lib/orchid/version.rb b/lib/orchid/version.rb index 62d12bd3..57c14afe 100644 --- a/lib/orchid/version.rb +++ b/lib/orchid/version.rb @@ -1,3 +1,3 @@ module Orchid - VERSION = '3.0.2' + VERSION = '3.0.3' end