From bdd030c860aa512f726417a22f8ea1949eafefa8 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 9 Aug 2017 10:53:26 -0700 Subject: [PATCH] Bug 17047 [QA Followup] - Misc minor fixes --- Koha/Subscription.pm | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Koha/Subscription.pm b/Koha/Subscription.pm index a6bdbae..34f7050 100644 --- a/Koha/Subscription.pm +++ b/Koha/Subscription.pm @@ -49,6 +49,7 @@ sub get_search_info { my $self=shift; my $searched_sub_id = shift; my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } ); + return unless $biblio; my $biblioitem = Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index a4bbe62..f5e4bcd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -118,7 +118,7 @@ jQuery(function($){ dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")], weekHeader: _("Wk"), dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSIF ( dateformat == "dmydot" ) %]dd.mm.yy[% ELSE %]yy-mm-dd[% END %]", - firstDay: [% Koha.Preference('CalendarFirstDayOfWeek') %], + firstDay: '[% Koha.Preference('CalendarFirstDayOfWeek') %]', isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %], showMonthAfterYear: false, yearSuffix: ''}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 6131ed1..78c4cbb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -165,7 +165,7 @@ [% IF mana %]
- [% INCLUDE 'mana-subscription-search-result.inc' %] + [% INCLUDE 'mana/mana-subscription-search-result.inc' %]
[% ELSE %]
-- 1.7.10.4