projects / koha-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: 91790fd)
Bug 21082: (RM follow-up) address QA issues
authorNick Clemens <nick@bywatersolutions.com>
Tue, 9 Oct 2018 10:56:43 +0000 (10:56 +0000)
committerNick Clemens <nick@bywatersolutions.com>
Tue, 9 Oct 2018 11:04:24 +0000 (11:04 +0000)
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt patch | blob | history
opac/svc/overdrive patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
index dde99d3..417d1ba 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
@@ -1,3 +1,4 @@
+[% USE raw %]
 [% USE Asset %]
 [% USE Branches %]
 [% USE HtmlTags %]
@@ -5,7 +6,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Library OverDrive Info &rsaquo;</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") %]
+[% Asset.css("css/datatables.css") | $raw %]
 </head>
 
 <body id="admin_overdrive" class="admin">
@@ -35,11 +36,11 @@
                 [% FOREACH b IN branches %]
                 <tr>
                 <td>
-                    [% Branches.GetName( b.branchcode ) %]
-                    <input type="hidden" name="branchcode" value="[% b.branchcode %]" />
+                    [% Branches.GetName( b.branchcode ) | html %]
+                    <input type="hidden" name="branchcode" value="[% b.branchcode | html %]" />
                 </td>
                 <td>
-                    <input type="text" name="authname" value="[% b.authname %]" />
+                    <input type="text" name="authname" value="[% b.authname | html %]" />
                 </td>
                 </tr>
                 [% END %]
@@ -56,7 +57,7 @@
 </div>
 
 [% MACRO jsinclude BLOCK %]
-    [% Asset.js("js/admin-menu.js") %]
+    [% Asset.js("js/admin-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script type="text/javascript">
diff --git a/opac/svc/overdrive b/opac/svc/overdrive
index 6fb949d..3ede3f4 100755 (executable)
--- a/opac/svc/overdrive
+++ b/opac/svc/overdrive
@@ -47,8 +47,8 @@ eval {
             $action eq 'login' && do {
                 my $password = $cgi->param("password") // q{} ;
                 my $patron = Koha::Patrons->find({ userid => $user });
-                my $branch_info = Koha::Library::OverDriveInfos->find( $patron->branchcode ) if $patron;
-                my $branch_authname = $branch_info->authname if $branch_info;
+                my $branch_info = $patron ? Koha::Library::OverDriveInfos->find( $patron->branchcode ) : undef;
+                my $branch_authname = $branch_info ? $branch_info->authname : undef;
                 my $authname = $branch_authname || C4::Context->preference('OverDriveAuthname');
                 $od->auth_by_userid($user, $password,C4::Context->preference('OverDriveWebsiteID'),$authname);
                 $data{login_success} = 1;
Koha with Equinox developments in process and local tweaks