Bugzilla – Attachment 69044 Details for
Bug 7317
Add an Interlibrary Loan Module to Circulation and OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7317: (QA followup) Rename 'branch' for 'library'
Bug-7317-QA-followup-Rename-branch-for-library.patch (text/plain), 3.96 KB, created by
Tomás Cohen Arazi (tcohen)
on 2017-11-08 19:33:40 UTC
(
hide
)
Description:
Bug 7317: (QA followup) Rename 'branch' for 'library'
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2017-11-08 19:33:40 UTC
Size:
3.96 KB
patch
obsolete
>From f6defa35bc213793539e7049da80e8494f9415d5 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Wed, 8 Nov 2017 16:08:01 -0300 >Subject: [PATCH] Bug 7317: (QA followup) Rename 'branch' for 'library' > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > Koha/Illrequest.pm | 4 ++-- > api/v1/swagger/paths/illrequests.json | 2 +- > t/db_dependent/Illrequests.t | 10 +++++----- > t/db_dependent/api/v1/illrequests.t | 4 ++-- > 4 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm >index 01a870d290..b6585c23ab 100644 >--- a/Koha/Illrequest.pm >+++ b/Koha/Illrequest.pm >@@ -1018,8 +1018,8 @@ sub TO_JSON { > $object->{capabilities} = $self->capabilities; > } > # Augment the request response with library details if appropriate >- if ( $embed->{branch} ) { >- $object->{branch} = Koha::Libraries->find( >+ if ( $embed->{library} ) { >+ $object->{library} = Koha::Libraries->find( > $self->branchcode > )->TO_JSON; > } >diff --git a/api/v1/swagger/paths/illrequests.json b/api/v1/swagger/paths/illrequests.json >index 5372cb9d09..48f61fde31 100644 >--- a/api/v1/swagger/paths/illrequests.json >+++ b/api/v1/swagger/paths/illrequests.json >@@ -15,7 +15,7 @@ > "type": "string", > "enum": [ > "patron", >- "branch", >+ "library", > "capabilities", > "metadata" > ] >diff --git a/t/db_dependent/Illrequests.t b/t/db_dependent/Illrequests.t >index 4259a70fec..761de9f12b 100644 >--- a/t/db_dependent/Illrequests.t >+++ b/t/db_dependent/Illrequests.t >@@ -837,11 +837,11 @@ subtest 'TO_JSON() tests' => sub { > undef, '%embed not passed, no \'metadata\' attribute' ); > is( $illreq_json->{capabilities}, > undef, '%embed not passed, no \'capabilities\' attribute' ); >- is( $illreq_json->{branch}, >- undef, '%embed not passed, no \'branch\' attribute' ); >+ is( $illreq_json->{library}, >+ undef, '%embed not passed, no \'library\' attribute' ); > > $illreq_json = $illreq->TO_JSON( >- { patron => 1, metadata => 1, capabilities => 1, branch => 1 } ); >+ { patron => 1, metadata => 1, capabilities => 1, library => 1 } ); > is( $illreq_json->{patron}->{firstname}, > $patron->firstname, > '%embed passed, \'patron\' attribute correct (firstname)' ); >@@ -855,8 +855,8 @@ subtest 'TO_JSON() tests' => sub { > 'metawhat?', '%embed passed, \'metadata\' attribute correct' ); > is( $illreq_json->{capabilities}, > 'capable', '%embed passed, \'capabilities\' attribute correct' ); >- is( $illreq_json->{branch}->{branchcode}, >- $library->branchcode, '%embed not passed, no \'branch\' attribute' ); >+ is( $illreq_json->{library}->{branchcode}, >+ $library->branchcode, '%embed not passed, no \'library\' attribute' ); > > $schema->storage->txn_rollback; > }; >diff --git a/t/db_dependent/api/v1/illrequests.t b/t/db_dependent/api/v1/illrequests.t >index cd1b04a1d6..b0850e9192 100644 >--- a/t/db_dependent/api/v1/illrequests.t >+++ b/t/db_dependent/api/v1/illrequests.t >@@ -81,13 +81,13 @@ subtest 'list() tests' => sub { > > # One illrequest created, returned with augmented data > $tx = $t->ua->build_tx( GET => >- '/api/v1/illrequests?embed=patron,branch,capabilities,metadata' ); >+ '/api/v1/illrequests?embed=patron,library,capabilities,metadata' ); > $tx->req->cookies( { name => 'CGISESSID', value => $session_id } ); > $tx->req->env( { REMOTE_ADDR => $remote_address } ); > $t->request_ok($tx)->status_is(200)->json_is( > [ > $illrequest->TO_JSON( >- { patron => 1, branch => 1, capabilities => 1, metadata => 1 } >+ { patron => 1, library => 1, capabilities => 1, metadata => 1 } > ) > ] > ); >-- >2.14.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 7317
:
59893
|
59894
|
59895
|
59920
|
60485
|
60486
|
60487
|
60488
|
63081
|
63082
|
63083
|
63084
|
63085
|
63086
|
63087
|
63088
|
63089
|
63090
|
63113
|
63175
|
63176
|
63354
|
63421
|
63472
|
63475
|
65469
|
65470
|
65471
|
65472
|
65473
|
65474
|
65475
|
65476
|
66266
|
67242
|
67243
|
67244
|
67245
|
67246
|
67247
|
67248
|
67249
|
67250
|
67251
|
67252
|
67253
|
67254
|
67255
|
67256
|
67257
|
67258
|
67259
|
67260
|
67261
|
67262
|
67263
|
67264
|
67281
|
67282
|
67283
|
67284
|
67285
|
67286
|
67287
|
67288
|
67289
|
67290
|
67291
|
67292
|
67293
|
67294
|
67295
|
67296
|
67297
|
67298
|
67299
|
67300
|
67301
|
67302
|
67303
|
68185
|
68186
|
68328
|
68391
|
68406
|
68407
|
68408
|
68409
|
68418
|
68444
|
68445
|
68483
|
68484
|
68485
|
68487
|
68516
|
68517
|
68518
|
68519
|
68520
|
68521
|
68522
|
68523
|
68524
|
68525
|
68542
|
68543
|
68544
|
68545
|
68546
|
68547
|
68548
|
68549
|
68550
|
68551
|
68552
|
68558
|
68559
|
68560
|
68561
|
68562
|
68563
|
68564
|
68565
|
68566
|
68567
|
68858
|
68874
|
68877
|
68878
|
68885
|
68886
|
68921
|
68922
|
68926
|
68927
|
68928
|
68929
|
68931
|
68932
|
68933
|
68988
|
68989
|
68999
|
69000
|
69006
|
69008
|
69009
|
69012
|
69014
| 69044 |
69045
|
69046
|
69056
|
69059
|
69060
|
69061
|
69063
|
69064
|
69065
|
69066
|
69069
|
69070
|
69071
|
69074