From 180c6be98abf882ab3f90aaa075d1ac1d897876f Mon Sep 17 00:00:00 2001 From: Maryse Simard Date: Thu, 21 Jan 2021 01:09:46 -0500 Subject: [PATCH] Bug 17015: don't use default library --- Koha/DiscreteCalendar.pm | 3 +-- .../bug_17015_part2_fill_discrete_calendar.perl | 4 ---- .../prog/en/modules/tools/discrete_calendar.tt | 6 ++++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Koha/DiscreteCalendar.pm b/Koha/DiscreteCalendar.pm index 9126dfd7ef..9375400b9a 100644 --- a/Koha/DiscreteCalendar.pm +++ b/Koha/DiscreteCalendar.pm @@ -107,7 +107,7 @@ sub _init { ); #use default if no calendar is found if (!$rs){ - $self->{branchcode} = ''; + $self->{branchcode} = undef; $self->{no_branch_selected} = 1; } @@ -169,7 +169,6 @@ C<$newBranch> is the branch to be created, and copy into sub add_new_branch { my ( $classname, $copyBranch, $newBranch) = @_; - $copyBranch = '' unless $copyBranch; my $schema = Koha::Database->new->schema; my $branch_rs = $schema->resultset('DiscreteCalendar')->search({ diff --git a/installer/data/mysql/atomicupdate/bug_17015_part2_fill_discrete_calendar.perl b/installer/data/mysql/atomicupdate/bug_17015_part2_fill_discrete_calendar.perl index 45d63fe718..4a80345e77 100755 --- a/installer/data/mysql/atomicupdate/bug_17015_part2_fill_discrete_calendar.perl +++ b/installer/data/mysql/atomicupdate/bug_17015_part2_fill_discrete_calendar.perl @@ -36,10 +36,6 @@ time_zone => C4::Context->tz() )->truncate( to => 'day' ); $endDate->add(days => $daysInFuture); -#Added a default (standard) branch. -my $add_default_branch = 'INSERT IGNORE INTO branches (branchname, branchcode) VALUES(?,?)'; -my $add_Branch_Sth = $dbh->prepare($add_default_branch); -$add_Branch_Sth->execute('Default', ''); # finds branches; my $selectBranchesSt = 'SELECT branchname, branchcode FROM branches'; my $selectBranchesSth = $dbh->prepare($selectBranchesSt); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt index 960d34ffff..7d85dca415 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt @@ -51,7 +51,7 @@ [% IF no_branch_selected %]
- No library set! You are using the default calendar. + No library set!
[% END %] @@ -608,7 +608,9 @@ //Main datepicker $("#jcalendar-container").datepicker({ onSelect: function(dateText, inst) { - dateChanged(dateText, $(this).datepicker("getDate")); + [% IF datesInfos %] + dateChanged(dateText, $(this).datepicker("getDate")); + [% END %] }, }); $('#from_copyToDatePicker').datepicker(); -- 2.17.1