From eaa9882dd10414cf16ecaf80bcf856bfc60e42c1 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Fri, 3 Feb 2017 10:18:51 +1300 Subject: [PATCH] Bug 14764 - [followup] Addressing QA concerns * removed Policy: * put the syspref in alpha order with the others * added els to the if. Signed-off-by: Baptiste Wojtkowski Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- installer/data/mysql/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 1 - opac/opac-main.pl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 021986c838..e46e29f68a 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -288,7 +288,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'), ('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'), ('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'), -('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'), ('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'), ('OpacAdvSearchMoreOptions','pubdate,itemtype,language,subtype,sorting,location','Show search options for the expanded view (More options)','pubdate|itemtype|language|subtype|sorting|location','multiple'), ('OpacAdvSearchOptions','pubdate,itemtype,language,sorting,location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'), @@ -343,6 +342,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'), ('OpacNavRight','','70|10','Show the following HTML in the right hand column of the main page under the main login form','Textarea'), +('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','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'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index a049fd3d38..b6954ef667 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -509,7 +509,6 @@ OPAC: yes: Display no: Don't display - a branch selection list for news items in the OPAC. - Policy: - - "Use the following as the OPAC ISBD template:" - pref: OPACISBD diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 421eb9c188..2f1f18c7b5 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -54,7 +54,7 @@ if (C4::Context->userenv) { if (defined $input->param('branch') and length $input->param('branch')) { $homebranch = $input->param('branch'); } -if (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){ +elsif (C4::Context->userenv and defined $input->param('branch') and length $input->param('branch') == 0 ){ $homebranch = ""; } my $all_koha_news = &GetNewsToDisplay($news_lang,$homebranch); -- 2.39.5