Bugzilla – Attachment 32217 Details for
Bug 7673
New patron permissions to manage items (edit, batchmod, delete all)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 7673: QA Followup: trailing whitespace and perlcritic issues
PASSED-QA-Bug-7673-QA-Followup-trailing-whitespace.patch (text/plain), 2.82 KB, created by
Katrin Fischer
on 2014-10-10 21:37:48 UTC
(
hide
)
Description:
[PASSED QA] Bug 7673: QA Followup: trailing whitespace and perlcritic issues
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-10-10 21:37:48 UTC
Size:
2.82 KB
patch
obsolete
>From bd1ea86e143e1bdb99d8f762e148cb61c1aa4321 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] [PASSED QA] 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). > >Signed-off-by: Koha Team AMU <koha.aixmarseille@gmail.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > cataloguing/additem.pl | 6 +++--- > tools/batchMod.pl | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl >index fe1db82..5f35077 100755 >--- a/cataloguing/additem.pl >+++ b/cataloguing/additem.pl >@@ -369,8 +369,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); > >@@ -833,7 +833,7 @@ foreach my $tag ( keys %{$tagslib}){ > 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 ca10f61..d0648e4 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.9.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 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