Bugzilla – Attachment 4782 Details for
Bug 6390
Basket only visible for librarian who created it
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Same patch as before in GIT format
viewbaskets (text/plain), 3.05 KB, created by
Edgar Fuß
on 2011-07-31 21:26:02 UTC
(
hide
)
Description:
Same patch as before in GIT format
Filename:
MIME Type:
Creator:
Edgar Fuß
Created:
2011-07-31 21:26:02 UTC
Size:
3.05 KB
patch
obsolete
>diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index cc5c084..2a7bb47 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,30 @@ 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 $uid = $userenv->{id}; >+# $loggedinuser == $userenv->{number} >+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 && >+# GetMember( borrowernumber => $authorisedby )->{branchcode} eq $userbranch >+ ($branchcache{$authorisedby} || ($branchcache{$authorisedby} = GetMember( borrowernumber => $authorisedby )->{branchcode})) eq $userbranch >+# || haspermission( $uid, { acquisition => q{*} } ) > ) { > 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 2a900f0..489a30b 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 >@@ -9,6 +9,13 @@ Acquisitions: > receiving: receiving an order. > cataloguing: cataloging the record. > - >+ - 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:
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 6390
:
4778
|
4782
|
4853
|
5323
|
5324
|
5461
|
5462
|
5463
|
5464
|
5518
|
5802
|
5862
|
5863
|
5935
|
5963
|
5966