Attachment 92314 Details for Bug 14570 – Bug 14570: (follow-up) fix qa FAIL tests

[patch] Bug 14570: (follow-up) fix qa FAIL tests

Bug-14570-follow-up-fix-qa-FAIL-tests.patch (text/plain), 5.97 KB, created by Tomás Cohen Arazi (tcohen) on 2019-08-16 19:46:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2019-08-16 19:46:03 UTC

Size: 5.97 KB

patch

obsolete

>From bf6c1d025d4cddc1afd3284d45e35231aa87fd1e Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Fri, 17 May 2019 21:38:37 -0300
>Subject: [PATCH] Bug 14570: (follow-up) fix qa FAIL tests
>
>Signed-off-by: Agustin Moyano <agustinmoyano@theke.io>
>
>Signed-off-by: Liz Rea <wizzyrea@gmail.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> Koha/Patron/Relationships.pm                       |  6 ++++--
> Koha/Patrons.pm                                    |  4 ++++
> .../prog/en/modules/circ/circulation.tt            |  2 +-
> .../prog/en/modules/members/memberentrygen.tt      | 14 +++++++-------
> .../prog/en/modules/members/moremember-brief.tt    |  2 +-
> members/memberentry.pl                             |  3 ++-
> t/db_dependent/Items.t                             |  2 +-
> 7 files changed, 20 insertions(+), 13 deletions(-)
>
>diff --git a/Koha/Patron/Relationships.pm b/Koha/Patron/Relationships.pm
>index 0cdfa9fb09..db3b107def 100644
>--- a/Koha/Patron/Relationships.pm
>+++ b/Koha/Patron/Relationships.pm
>@@ -82,8 +82,6 @@ sub guarantees {
>     return wantarray ? $guarantees->as_list : $guarantees;
> }
> 
>-=cut
>-
> =head3 type
> 
> =cut
>@@ -92,6 +90,10 @@ sub _type {
>     return 'BorrowerRelationship';
> }
> 
>+=head3 object_class
>+
>+=cut
>+
> sub object_class {
>     return 'Koha::Patron::Relationship';
> }
>diff --git a/Koha/Patrons.pm b/Koha/Patrons.pm
>index 80537197b8..4a5f63c1e4 100644
>--- a/Koha/Patrons.pm
>+++ b/Koha/Patrons.pm
>@@ -368,6 +368,10 @@ sub _type {
>     return 'Borrower';
> }
> 
>+=head3 object_class
>+
>+=cut
>+
> sub object_class {
>     return 'Koha::Patron';
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 3c41a25fcd..5fb4889bed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -824,7 +824,7 @@
>                             </li>
> 
>                             [% IF relatives_issues_count %]
>-                                <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count %] Relatives' checkouts</a></li>
>+                                <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
>                             [% END %]
> 
>                             <li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index ec200302ff..bdb7bf89f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -470,23 +470,23 @@
>             </li>
>         [% END %]
> 
>-		[% UNLESS norelationship %]
>-			[% IF possible_relationships %]
>+        [% UNLESS norelationship %]
>+            [% IF possible_relationships %]
>                 <li>
>                     <label for="relationship">Relationship: </label>
>                     <select class="relationship" name="relationship">
>                         <option value=""></option>
>                         [% FOREACH pr IN possible_relationships.split('\|') %]
>                             [% IF pr == relationship %]
>-                                <option value="[% pr %]" selected="selected">[% pr %]</option>
>+                                <option value="[% pr | html %]" selected="selected">[% pr | html %]</option>
>                             [% ELSE %]
>-                                <option value="[% pr %]">[% pr %]</option>
>+                                <option value="[% pr | html %]">[% pr | html %]</option>
>                             [% END %]
>                         [% END %]
>                     </select>
>                 </li>
>-			[% END %]
>-		[% END %]
>+            [% END %]
>+        [% END %]
> 
>         [% UNLESS nophone %]
>             <li>
>@@ -1231,7 +1231,7 @@
>             [% END %]
> 
>             [% IF guarantor %]
>-                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | $raw %] );
>+                select_user( '[% guarantor.borrowernumber | html %]', [% To.json( guarantor.unblessed ) | $raw %] );
>             [% END %]
> 
>             $("#cn_max").hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>index 5170914ffc..1c3b2c3b1b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>@@ -60,7 +60,7 @@
>                     </li>
>                 [% END %]
>             [% END %]
>-	    </ol>
>+        </ol>
>     </div>
> </div>
> </div>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index 9aa1462186..fbf2866b26 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -108,7 +108,8 @@ my $userenv = C4::Context->userenv;
> $template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;
> 
> my $guarantor_id = $input->param('guarantor_id');
>-my $guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
>+my $guarantor = undef;
>+$guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
> $template->param( guarantor => $guarantor );
> 
> my @delete_guarantor = $input->multi_param('delete_guarantor');
>diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t
>index 01308245d2..8570eb0d25 100755
>--- a/t/db_dependent/Items.t
>+++ b/t/db_dependent/Items.t
>@@ -589,7 +589,7 @@ subtest 'Koha::Item(s) tests' => sub {
>     is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
>     is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
> 
>-    my $biblio = $item->biblio();
>+    $biblio = $item->biblio();
>     is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
>     is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
> 
>-- 
>2.22.1

Actions: View | Diff | Splinter Review

Attachments on bug 14570: 52400 | 52401 | 52402 | 52403 | 52406 | 52407 | 58146 | 58147 | 58159 | 58202 | 58391 | 58399 | 58412 | 58688 | 58689 | 58739 | 58762 | 58763 | 58764 | 58834 | 58835 | 58836 | 58837 | 58838 | 58839 | 58949 | 58950 | 58951 | 58952 | 58953 | 58954 | 58972 | 58973 | 58974 | 58975 | 58976 | 58977 | 58978 | 58979 | 58980 | 62450 | 62451 | 62452 | 64124 | 64125 | 64126 | 71160 | 71161 | 71162 | 71163 | 73283 | 73284 | 73583 | 73584 | 74950 | 74951 | 74952 | 74953 | 74954 | 74976 | 74977 | 74978 | 74979 | 77029 | 77030 | 77031 | 77032 | 77033 | 77034 | 77040 | 77041 | 77042 | 77043 | 77044 | 77045 | 77046 | 77047 | 77048 | 77049 | 77067 | 77068 | 77069 | 77070 | 77071 | 77072 | 77073 | 77074 | 77075 | 77076 | 77077 | 77078 | 77290 | 77291 | 77346 | 77347 | 77348 | 80842 | 80849 | 81932 | 81933 | 85411 | 85412 | 85431 | 89889 | 89890 | 89891 | 89892 | 89909 | 89910 | 89911 | 89912 | 89921 | 89922 | 89929 | 90048 | 91231 | 91439 | 91440 | 91441 | 91442 | 91443 | 91444 | 91445 | 91694 | 91695 | 91696 | 91697 | 91698 | 91699 | 91700 | 92157 | 92158 | 92161 | 92162 | 92163 | 92180 | 92181 | 92182 | 92183 | 92232 | 92233 | 92234 | 92235 | 92277 | 92278 | 92279 | 92280 | 92281 | 92282 | 92283 | 92284 | 92285 | 92286 | 92287 | 92288 | 92289 | 92290 | 92291 | 92292 | 92298 | 92299 | 92300 | 92301 | 92302 | 92303 | 92304 | 92305 | 92306 | 92307 | 92308 | 92309 | 92310 | 92311 | 92312 | 92313 | 92314 | 92315 | 92316 | 92317 | 92318 | 92319 | 92320 | 92321 | 92322 | 92323 | 92324 | 92325 | 92346 | 92347 | 92348 | 92349 | 92350