From 6e66d16355bbe13a85f7bd978a90c42ca7f58564 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 5 Aug 2011 10:13:20 +0200 Subject: [PATCH] Bug 6390: Implement 'see mine/my branches/all baskets'-syspref MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Code written by Edgar Fuß , Mathematisches Institut der Uniersität Bonn Signed-off-by: Nicole C. Engard --- acqui/booksellers.pl | 20 ++++++++++++-------- admin/systempreferences.pl | 1 + .../en/modules/admin/preferences/acquisitions.pref | 7 +++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index cc5c084..4f1195d 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -59,6 +59,7 @@ use CGI; use C4::Dates qw/format_date/; use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /; use C4::Members qw/GetMember/; +use C4::Context; my $query = CGI->new; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -90,23 +91,26 @@ if ( $supplier_count == 1 ) { ); } -my $uid; -if ($loggedinuser) { - $uid = GetMember( borrowernumber => $loggedinuser )->{userid}; -} +my $userenv = C4::Context::userenv; +my $viewbaskets = C4::Context->preference('AcqViewBaskets'); + +my $userbranch = $userenv->{branch}; #build result page my $loop_suppliers = []; +my %branchcache; + for my $vendor (@suppliers) { my $baskets = get_vendors_baskets( $vendor->{id} ); my $loop_basket = []; for my $basket ( @{$baskets} ) { - if (( $basket->{authorisedby} - && $basket->{authorisedby} eq $loggedinuser - ) - || haspermission( $uid, { flagsrequired => { acquisition => q{*} } } ) + my $authorisedby = $basket->{authorisedby}; + if ($authorisedby && $authorisedby == $loggedinuser + || $viewbaskets eq 'all' + || $viewbaskets eq 'branch' && $authorisedby && + ($branchcache{$authorisedby} || ($branchcache{$authorisedby} = GetMember( borrowernumber => $authorisedby )->{branchcode})) eq $userbranch ) { for my $date_field (qw( creationdate closedate)) { if ( $basket->{$date_field} ) { diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 87ecac4..78d0768 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -76,6 +76,7 @@ my %tabsysprefs; $tabsysprefs{AcqCreateItem}="Acquisitions"; $tabsysprefs{OrderPdfFormat}="Acquisitions"; $tabsysprefs{CurrencyFormat}="Acquisitions"; + $tabsysprefs{AcqViewBaskets}="Acquisitions"; # Admin $tabsysprefs{singleBranchMode} = "Admin"; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 43a7ad5..52da32a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -16,6 +16,13 @@ Acquisitions: 1: always ask for confirmation. 2: do not ask for confirmation. - + - Allow a user to view baskets created + - pref: AcqViewBaskets + choices: + user: by him only + branch: at his branch + all: by anyone + - - Display currencies using the following format - pref: CurrencyFormat choices: -- 1.7.4.1