From d352b3c9c6882c89bfb653213d8a932469d91783 Mon Sep 17 00:00:00 2001 From: Maryse Simard Date: Fri, 20 Jul 2018 17:20:23 -0400 Subject: [PATCH] Bug 19039: (follow-up) Results of virtual shelves (lists) not sortable by date In the staff client, when viewing the content of a list, it can be sorted by 'title', 'author' or 'call number' but not by 'date added'. This patch adds 'date added' as an option for default sorting of lists. It also makes it available as a sorting option while viewing lists. Test plan: In the staff client and the opac: 1) View a list containing several items => Notice that you can't sort by 'date added' 2) Try to edit the list or create a new one => Notice you can't choose date added as the default sort order 3) Apply the patch 4) When viewing the list you should now be able to sort by date added => Make sure it orders correctly 5) Edit or create a list and choose date added as default sorting order => Make sure it uses date added as default => On the staff client: test that the filter for 'sort by' works for date added => On the opac: test that, while viewing the contents, choosing 'default sorting' in the dropdown menu sorts correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../prog/en/modules/virtualshelves/shelves.tt | 2 ++ .../modules/virtualshelves/tables/shelves_results.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 11 +++++++++++ opac/opac-shelves.pl | 4 ++-- virtualshelves/shelves.pl | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 68b47d7473..55fdeefaec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -297,6 +297,7 @@ [% IF shelf.sortfield == "author" %][% ELSE %][% END %] [% IF shelf.sortfield == "copyrightdate" %][% ELSE %][% END %] [% IF shelf.sortfield == "itemcallnumber" %][% ELSE %][% END %] + [% IF shelf.sortfield == "dateadded" %][% ELSE %][% END %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index a9c4da590d..3cb77eda49 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -19,7 +19,7 @@ "dt_owner": "[% data.firstname | html %] [% data.surname | html %]", "dt_sortby": - [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSE %]"Title"[% END %], + [% IF data.sortby == "author" %]"Author"[% ELSIF data.sortby == "copyrightdate" %]"Year"[% ELSIF data.sortby == "itemcallnumber" %]"Call number"[% ELSIF data.sortby == "dateadded" %]"Date added"[% ELSE %]"Title"[% END %], "dt_created_on": "[% data.created_on | $KohaDates %]", "dt_modification_time": diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 5dce617804..34b720126d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -230,6 +230,12 @@ [% ELSE %] [% END %] + + [% IF sortfield == "dateadded" %] + + [% ELSE %] + + [% END %]
    • [% IF Koha.Preference('OpacAllowPublicListCreation') OR category == PUBLIC %] diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl index b2799ea023..4fc4efbe79 100755 --- a/opac/opac-shelves.pl +++ b/opac/opac-shelves.pl @@ -114,7 +114,7 @@ if ( $op eq 'add_form' ) { if ( $shelf ) { $op = $referer; my $sortfield = $query->param('sortfield'); - $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber ); + $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded ); if ( $shelf->can_be_managed( $loggedinuser ) ) { $shelf->shelfname( scalar $query->param('shelfname') ); $shelf->sortfield( $sortfield ); @@ -235,7 +235,7 @@ if ( $op eq 'view' ) { if ( $shelf->can_be_viewed( $loggedinuser ) ) { $category = $shelf->category; my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting - $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber ); + $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded ); my $direction = $query->param('direction') || 'asc'; $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc'; my ( $page, $rows ); diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index bc54559073..2758720cd0 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -101,7 +101,7 @@ if ( $op eq 'add_form' ) { if ( $shelf ) { $op = $referer; my $sortfield = $query->param('sortfield'); - $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber ); + $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded ); if ( $shelf->can_be_managed( $loggedinuser ) ) { $shelf->shelfname( scalar $query->param('shelfname') ); $shelf->sortfield( $sortfield ); -- 2.39.5