Bugzilla – Attachment 26426 Details for
Bug 11848
Make Koha::I18N easier to use
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11848: Fix C4::Context::interface, add POD and UT
Bug-11848-Fix-C4Contextinterface-add-POD-and-UT.patch (text/plain), 2.36 KB, created by
Julian Maurice
on 2014-03-17 22:29:26 UTC
(
hide
)
Description:
Bug 11848: Fix C4::Context::interface, add POD and UT
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2014-03-17 22:29:26 UTC
Size:
2.36 KB
patch
obsolete
>From db9b5603e352b37b577563456628eb51700c18b0 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Mon, 17 Mar 2014 23:25:37 +0100 >Subject: [PATCH] Bug 11848: Fix C4::Context::interface, add POD and UT > >--- > C4/Context.pm | 20 +++++++++++++++++--- > t/Context.t | 16 +++++++++++++++- > 2 files changed, 32 insertions(+), 4 deletions(-) > >diff --git a/C4/Context.pm b/C4/Context.pm >index 8329610..af14237 100644 >--- a/C4/Context.pm >+++ b/C4/Context.pm >@@ -1250,15 +1250,29 @@ sub IsSuperLibrarian { > return $userenv->{flags} % 2; > } > >+=head2 interface >+ >+Sets the current interface for later retrieval in any Perl module >+ >+ C4::Context->interface('opac'); >+ C4::Context->interface('intranet'); >+ my $interface = C4::Context->interface; >+ >+=cut >+ > sub interface { > my ($class, $interface) = @_; > > if (defined $interface) { >- $interface ||= 'opac'; >- $context->{interface} = $interface; >+ $interface = lc $interface; >+ if ($interface eq 'opac' || $interface eq 'intranet') { >+ $context->{interface} = $interface; >+ } else { >+ warn "invalid interface : '$interface'"; >+ } > } > >- return $context->{interface}; >+ return $context->{interface} // 'opac'; > } > > 1; >diff --git a/t/Context.t b/t/Context.t >index 446e254..21f0947 100755 >--- a/t/Context.t >+++ b/t/Context.t >@@ -2,7 +2,7 @@ > > use Modern::Perl; > use DBI; >-use Test::More tests => 10; >+use Test::More tests => 20; > use Test::MockModule; > > BEGIN { >@@ -35,3 +35,17 @@ is(C4::Context::db_scheme2dbi('mysql'), 'mysql', 'ask for mysql, get mysql'); > is(C4::Context::db_scheme2dbi('Pg'), 'Pg', 'ask for Pg, get Pg'); > is(C4::Context::db_scheme2dbi('xxx'), 'mysql', 'ask for unsupported DBMS, get mysql'); > is(C4::Context::db_scheme2dbi(), 'mysql', 'ask for nothing, get mysql'); >+ >+# C4::Context::interface >+my $lastwarn; >+local $SIG{__WARN__} = sub { $lastwarn = $_[0] }; >+is(C4::Context->interface, 'opac'); >+is(C4::Context->interface('foobar'), 'opac'); >+like($lastwarn, qr/invalid interface : 'foobar'/); >+is(C4::Context->interface, 'opac'); >+is(C4::Context->interface('intranet'), 'intranet'); >+is(C4::Context->interface, 'intranet'); >+is(C4::Context->interface('foobar'), 'intranet'); >+is(C4::Context->interface, 'intranet'); >+is(C4::Context->interface('OPAC'), 'opac'); >+is(C4::Context->interface, 'opac'); >-- >1.7.10.4
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 11848
:
25664
|
25665
|
26426
|
26494
|
26495
|
26496
|
27747
|
27748
|
27749