Bugzilla – Attachment 115511 Details for
Bug 17015
New Koha Calendar
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17015: don't use default library
Bug-17015-dont-use-default-library.patch (text/plain), 3.07 KB, created by
Maryse Simard
on 2021-01-21 06:54:12 UTC
(
hide
)
Description:
Bug 17015: don't use default library
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2021-01-21 06:54:12 UTC
Size:
3.07 KB
patch
obsolete
>From 180c6be98abf882ab3f90aaa075d1ac1d897876f Mon Sep 17 00:00:00 2001 >From: Maryse Simard <maryse.simard@inlibro.com> >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 %] > <div class="alert alert-danger" style="float: left; margin-left:15px"> >- <strong>No library set!</strong> You are using the default calendar. >+ <strong>No library set!</strong> > </div> > [% 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17015
:
53859
|
54318
|
54419
|
59166
|
59167
|
59168
|
59169
|
59170
|
59171
|
59267
|
59268
|
59269
|
59270
|
59271
|
59463
|
59516
|
59517
|
59518
|
59519
|
59520
|
59561
|
59562
|
59586
|
59587
|
59888
|
59889
|
60902
|
60903
|
60904
|
60905
|
60906
|
60986
|
61737
|
62375
|
62376
|
62380
|
63257
|
63282
|
63362
|
63363
|
63364
|
63365
|
63366
|
63367
|
64235
|
65073
|
65074
|
65075
|
65076
|
65077
|
67721
|
67722
|
67723
|
67724
|
67725
|
67879
|
67929
|
67930
|
67931
|
67932
|
67933
|
67934
|
68392
|
68393
|
68394
|
68395
|
68396
|
68397
|
71634
|
71635
|
71636
|
71637
|
71638
|
72890
|
73145
|
74859
|
74860
|
74861
|
74862
|
74863
|
74864
|
74865
|
74866
|
75444
|
75479
|
76594
|
77249
|
77250
|
77607
|
77608
|
77609
|
77610
|
77611
|
77612
|
77613
|
77770
|
77771
|
77772
|
77773
|
77774
|
79035
|
80523
|
80524
|
80525
|
80526
|
80527
|
80528
|
80529
|
80530
|
80531
|
80532
|
80533
|
80534
|
80535
|
83547
|
85394
|
85677
|
85678
|
85679
|
85680
|
85681
|
85682
|
85683
|
85684
|
85685
|
85686
|
85687
|
85688
|
85689
|
85690
|
85691
|
92595
|
92596
|
92597
|
92598
|
100079
|
110383
|
110384
|
110386
|
110387
|
110388
|
110389
|
113541
|
113905
|
115501
|
115502
|
115503
|
115504
|
115505
|
115506
|
115507
|
115508
|
115509
|
115510
|
115511
|
118554
|
118555
|
118556
|
118557
|
118558
|
118559
|
119095
|
119097
|
119099
|
119100
|
119101
|
119102
|
131619
|
131620
|
131621
|
131622
|
131623
|
131624
|
131625
|
131626
|
131634
|
131635
|
131636
|
131637
|
131638
|
131639
|
131640
|
131641
|
131667
|
132199
|
133596
|
133597
|
133598
|
133599
|
133600
|
133601
|
133602
|
133603
|
133604
|
133605
|
133678
|
137219
|
137220
|
137221
|
137222
|
137223
|
137224
|
137225
|
137226
|
137227
|
137228
|
137229
|
139378
|
139379
|
139380
|
139381
|
139382
|
139599
|
139600
|
139601
|
139602
|
139603
|
139851
|
140150
|
141176
|
144257
|
144258
|
144259
|
144260
|
144261
|
144262
|
144264
|
144268
|
144269
|
144270
|
144271
|
144272
|
144273
|
151438
|
151439
|
151440
|
151441
|
151442
|
151443
|
151444
|
151445
|
151446
|
151447
|
151448
|
151449
|
151450
|
156340
|
156341
|
156342
|
156343
|
156344
|
156345
|
156346
|
156347
|
156348
|
156349
|
156350
|
156351
|
156352
|
156353
|
156354
|
156355
|
157656
|
157657
|
157658
|
157659
|
157660
|
157661
|
157662
|
157663
|
157664
|
157665
|
157666
|
157667
|
157668
|
157669
|
157670
|
157671
|
157672
|
167805
|
167806
|
167807
|
167808
|
167809