Attachment 27632 Details for Bug 7673 – Bug 7673: QA Followup: trailing whitespace and perlcritic issues

[patch] Bug 7673: QA Followup: trailing whitespace and perlcritic issues

Bug-7673-QA-Followup-trailing-whitespace-and-perlc.patch (text/plain), 3.14 KB, created by Jonathan Druart on 2014-04-25 14:54:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-04-25 14:54:46 UTC

Size: 3.14 KB

patch

obsolete

>From 5c702ee5025d3d073f6bd4b9ba5d3eef24b0da87 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 3 Dec 2013 15:09:01 +0100
>Subject: [PATCH] Bug 7673: QA Followup: trailing whitespace and perlcritic
> issues
>
>This patch fixes the following qa issues:
>
> FAIL   cataloguing/additem.pl
>   FAIL   forbidden patterns
>        forbidden pattern: trailing space char (line 833)
>   FAIL   critic
>        # Variables::ProhibitConditionalDeclarations: Got 2 violation(s).
>
> FAIL   tools/batchMod.pl
>   FAIL   critic
>        # Variables::ProhibitConditionalDeclarations: Got 2 violation(s).
>---
> cataloguing/additem.pl |    8 ++++----
> tools/batchMod.pl      |    4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
>index e89e96e..9b59a85 100755
>--- a/cataloguing/additem.pl
>+++ b/cataloguing/additem.pl
>@@ -370,8 +370,8 @@ my ($template, $loggedinuser, $cookie)
> 
> 
> # Does the user have a limited item edition permission?
>-my $uid = GetMember( borrowernumber => $loggedinuser )->{userid} if ($loggedinuser) ;
>-my $limitededition = haspermission($uid,  {'editcatalogue' => 'limited_item_edition'}) if ($uid);
>+my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef;
>+my $limitededition = $uid ? haspermission($uid,  {'editcatalogue' => 'limited_item_edition'}) : undef;
> # In case user is a superlibrarian, edition is not limited
> $limitededition = 0 if ($limitededition != 0 && $limitededition->{'superlibrarian'} eq 1);
> 
>@@ -831,10 +831,10 @@ foreach my $tag ( keys %{$tagslib}){
>         my @values = (undef);
>         @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
>         for my $value (@values){
>-            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $limitededition); 
>+            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $limitededition);
>             push (@loop_data, $subfield_data);
>             $i++;
>-        } 
>+        }
>   }
> }
> @loop_data = sort {$a->{subfield} cmp $b->{subfield} } @loop_data;
>diff --git a/tools/batchMod.pl b/tools/batchMod.pl
>index ce5fcf2..846ab10 100755
>--- a/tools/batchMod.pl
>+++ b/tools/batchMod.pl
>@@ -71,8 +71,8 @@ my ($template, $loggedinuser, $cookie)
>                  });
> 
> # Does the user have a limited item edition permission?
>-my $uid = GetMember( borrowernumber => $loggedinuser )->{userid} if ($loggedinuser) ;
>-my $limitededition = haspermission($uid,  {'tools' => 'items_limited_batchmod'}) if ($uid);
>+my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef;
>+my $limitededition = $uid ? haspermission($uid,  {'tools' => 'items_limited_batchmod'}) : undef;
> # In case user is a superlibrarian, edition is not limited
> $limitededition = 0 if ($limitededition != 0 && $limitededition->{'superlibrarian'} eq 1);
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 7673: 8714 | 9857 | 10360 | 12102 | 13004 | 16225 | 16239 | 16368 | 16371 | 23266 | 23267 | 23270 | 23271 | 26008 | 26009 | 26704 | 26705 | 26722 | 27631 | 27632 | 27633 | 27634 | 27635 | 27636 | 27637 | 27638 | 27640 | 27641 | 28007 | 28008 | 28009 | 28010 | 28011 | 28012 | 28013 | 28014 | 28015 | 29550 | 30910 | 30911 | 30912 | 30913 | 30914 | 30915 | 30916 | 30917 | 30918 | 30919 | 31010 | 31011 | 31012 | 31013 | 31015 | 31016 | 31017 | 31019 | 32200 | 32201 | 32215 | 32217 | 32219 | 32220 | 32222 | 32224 | 32225 | 32226 | 32227 | 32228 | 32928 | 32962 | 32993 | 33487