@@ -, +, @@
- Apply patch and run database update
- Search for 'noItemTypes' preferences
- Verify the settings of both prefs match
- Toggle prefs, verify everything works ok
- Go to the item types configuration page
- Try different settings for both prefs:
- Both set to No: Only a message with a link to the prefs should show
- Both set to Yes or either set to Yes: image configuration options
should show
- Check the following pages with item-level_itypes = record
- advanced search
- detail page
- place hold page
- Check the following pages with item-level_itypes = item
- result list
- a list (opac-shelves)
- checkouts and overdues tabs in patron account
(Note: this didn't work right before, but will now.)
- reading history in patron account
---
C4/UsageStats.pm | 1 +
.../bug_4944_OpacNoItemTypeImages.perl | 12 ++++++++++++
installer/data/mysql/sysprefs.sql | 3 ++-
.../prog/en/modules/admin/itemtypes.tt | 14 +++++++-------
.../prog/en/modules/admin/preferences/admin.pref | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 7 +++++++
.../prog/en/modules/catalogue/advsearch.tt | 2 +-
.../bootstrap/en/modules/opac-advsearch.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 ++--
.../bootstrap/en/modules/opac-readingrecord.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../bootstrap/en/modules/opac-results-grouped.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++--
15 files changed, 41 insertions(+), 20 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_4944_OpacNoItemTypeImages.perl
--- a/C4/UsageStats.pm
+++ a/C4/UsageStats.pm
@@ -100,6 +100,7 @@ sub BuildReport {
DebugLevel
delimiter
noItemTypeImages
+ OpacNoItemTypeImages
virtualshelves
AutoLocation
IndependentBranches
--- a/installer/data/mysql/atomicupdate/bug_4944_OpacNoItemTypeImages.perl
+++ a/installer/data/mysql/atomicupdate/bug_4944_OpacNoItemTypeImages.perl
@@ -0,0 +1,12 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if( CheckVersion( $DBversion ) ) {
+
+ my $noItemTypeImages = C4::Context->preference('noItemTypeImages');
+ $dbh->do( "INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
+ VALUES('OpacNoItemTypeImages',$noItemTypeImages,NULL,'If ON, disables itemtype images in the OPAC','YesNo')" );
+ $dbh->do( "UPDATE systempreferences SET explanation = 'If ON, disables itemtype images in the staff interface'
+ WHERE variable = 'noItemTypeImages' ");
+
+ # Always end with this (adjust the bug info)
+ NewVersion( $DBversion, 4944, "Add new system preference OpacNoItemTypeImages");
+}
--- a/installer/data/mysql/sysprefs.sql
+++ a/installer/data/mysql/sysprefs.sql
@@ -327,7 +327,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('NewsAuthorDisplay','none','none|opac|staff|both','Display the author name for news items.','Choice'),
('noissuescharge','5','','Define maximum amount withstanding before check outs are blocked','Integer'),
('NoIssuesChargeGuarantees','','','Define maximum amount withstanding before check outs are blocked','Integer'),
-('noItemTypeImages','0',NULL,'If ON, disables item-type images','YesNo'),
+('noItemTypeImages','0',NULL,'If ON, disables itemtype images in the staff interface','YesNo'),
('NoRenewalBeforePrecision','exact_time','date|exact_time','Calculate "No renewal before" based on date only or exact time of due date','Choice'),
('NotesBlacklist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'),
('NotHighlightedWords','and|or|not',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'),
@@ -412,6 +412,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('OpacNav','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
('OpacNavBottom','Important links here.','70|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),
+('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),
('OPACNoResultsFound','','70|10','Display this HTML when no results are found for a search in the OPAC','Textarea'),
('OPACNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number OPAC searches','YesNo'),
('OPACnumSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -140,13 +140,13 @@ Item types administration
Options are defined as the authorized values for the ITEMTYPECAT category.
- [% IF Koha.Preference('noItemTypeImages') %]
+ [% IF ( Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') ) %]