From f8cdb159cf79299cdf420b40c3cbc61c04e9d144 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Thu, 26 Oct 2017 09:29:55 -0400 Subject: [PATCH] Bug 11976: Rename things for clarity "Receival Date" is not what is used on the full history picture attached to this bug. Additionally, OPACSerialDisplayDate is better than OPACSerialDisplayPublicationDate. As the former clarifies that it could be more or less than Publication Date that is displayed. Signed-off-by: Mark Tompsett --- .../data/mysql/atomicupdate/Bug11976-DisplayPublishedDate.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/serials.pref | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/installer/data/mysql/atomicupdate/Bug11976-DisplayPublishedDate.sql b/installer/data/mysql/atomicupdate/Bug11976-DisplayPublishedDate.sql index fff212e..0905f85 100644 --- a/installer/data/mysql/atomicupdate/Bug11976-DisplayPublishedDate.sql +++ b/installer/data/mysql/atomicupdate/Bug11976-DisplayPublishedDate.sql @@ -1 +1 @@ -INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('OPACSerialDisplayPublishedDate', 'both', 'publication|receival|both', 'Which date should be displayed in the OPAC page of a serial', 'Choice'); \ No newline at end of file +INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) VALUES ('OPACSerialDisplayDate', 'both', 'publication|received|both', 'Which date should be displayed in the OPAC page of a serial', 'Choice'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index e009608..dc04345 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -376,7 +376,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacSeparateHoldings','0',NULL,'Separate current branch holdings from other holdings (OPAC)','YesNo'), ('OpacSeparateHoldingsBranch','homebranch','homebranch|holdingbranch','Branch used to separate holdings (OPAC)','Choice'), ('opacSerialDefaultTab','subscriptions','holdings|serialcollection|subscriptions','Define the default tab for serials in OPAC.','Choice'), -('OPACSerialDisplayPublishedDate', 'both', 'publication|receival|both', 'Which date should be displayed in the OPAC page of a serial', 'Choice'), +('OPACSerialDisplayDate', 'both', 'publication|received|both', 'Which date should be displayed in the OPAC page of a serial', 'Choice'), ('OPACSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the OPAC','Integer'), ('OPACShelfBrowser','1','','Enable/disable Shelf Browser on item details page. WARNING: this feature is very resource consuming on collections with large numbers of items.','YesNo'), ('OPACShowCheckoutName','0','','Displays in the OPAC the name of patron who has checked out the material. WARNING: Most sites should leave this off. It is intended for corporate or special sites which need to track who has the item.','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index c9c23a4..d01abe1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -9,11 +9,11 @@ Serials: - as default tab for serials in OPAC. Please note that the Serial Collection tab is currently available only for UNIMARC. - - Display the - - pref: OPACSerialDisplayPublishedDate + - pref: OPACSerialDisplayDate choices: publication: "publication date" - receival: "receival date" - both: "publication and receival dates" + received: "received date" + both: "publication and received dates" - in the OPAC details tab for serials. - - pref: RenewSerialAddsSuggestion diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 4756f6b..0e74030 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -847,11 +847,11 @@ - [% IF Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'publication' || Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'both' %] + [% IF Koha.Preference( 'OPACSerialDisplayDate' ) == 'publication' || Koha.Preference( 'OPACSerialDisplayDate' ) == 'both' %] [% END %] - [% IF Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'receival' || Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'both' %] - + [% IF Koha.Preference( 'OPACSerialDisplayDate' ) == 'received' || Koha.Preference( 'OPACSerialDisplayDate' ) == 'both' %] + [% END %] @@ -859,10 +859,10 @@ [% FOREACH latestserial IN subscription.latestserials %] - [% IF Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'publication' || Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'both' %] + [% IF Koha.Preference( 'OPACSerialDisplayDate' ) == 'publication' || Koha.Preference( 'OPACSerialDisplayDate' ) == 'both' %] [% END %] - [% IF Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'receival' || Koha.Preference( 'OPACSerialDisplayPublishedDate' ) == 'both' %] + [% IF Koha.Preference( 'OPACSerialDisplayDate' ) == 'received' || Koha.Preference( 'OPACSerialDisplayDate' ) == 'both' %] [% END %]
Issue #Publication dateReceival dateReceived dateStatus Note
[% latestserial.serialseq %][% latestserial.publisheddate %][% latestserial.planneddate %] -- 2.1.4