Bugzilla – Attachment 14518 Details for
Bug 7292
New permission for claims
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7292: More granular permissions for claiming orders
Bug-7292-More-granular-permissions-for-claiming-or.patch (text/plain), 15.23 KB, created by
Julian Maurice
on 2013-01-10 09:18:33 UTC
(
hide
)
Description:
Bug 7292: More granular permissions for claiming orders
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2013-01-10 09:18:33 UTC
Size:
15.23 KB
patch
obsolete
>From ed399e3f071e3c281cfbb423bf26268b3bec0811 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Wed, 16 May 2012 15:19:15 +0200 >Subject: [PATCH] Bug 7292: More granular permissions for claiming orders > >Add a new permission order_claim_for_all. >Without this permission, user can only claim for orders in baskets he's >authorised to manage (depends on bug 7295) >--- > acqui/lateorders.pl | 86 +++++++++++++++----- > .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + > .../data/mysql/en/mandatory/userpermissions.sql | 1 + > .../data/mysql/es-ES/mandatory/userpermissions.sql | 1 + > .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + > .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + > .../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 + > .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + > .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + > .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + > installer/data/mysql/updatedatabase.pl | 11 +++ > .../prog/en/modules/acqui/lateorders.tt | 15 +++- > 12 files changed, 99 insertions(+), 22 deletions(-) > >diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl >index 544370d..1135efe 100755 >--- a/acqui/lateorders.pl >+++ b/acqui/lateorders.pl >@@ -56,15 +56,36 @@ use C4::Branch; # GetBranches > use Koha::DateUtils; > > my $input = new CGI; >-my ($template, $loggedinuser, $cookie) = get_template_and_user({ >- template_name => "acqui/lateorders.tmpl", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => {acquisition => 'order_receive'}, >- debug => 1, >+my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({ >+ template_name => "acqui/lateorders.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => {acquisition => '*'}, >+ debug => 1, > }); > >+# Check if user has rights to access this page >+my $can_claim_for_all = 0; >+if ($userflags->{superlibrarian} >+ or (!ref $userflags->{acquisition} and $userflags->{acquisition}) >+ or (ref $userflags->{acquisition} >+ and $userflags->{acquisition}->{order_claim_for_all} >+ ) >+) { >+ $can_claim_for_all = 1; >+} >+ >+if ( !$can_claim_for_all >+ and ( >+ ref $userflags->{acquisition} >+ and not $userflags->{acquisition}->{order_receive} >+ ) >+) { >+ # Will fail to authenticate, so redirect to login screen >+ checkauth($input, 0, { acquisition => 'order_receive' }, "intranet"); >+} >+ > my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0 > my $delay = $input->param('delay'); > >@@ -101,21 +122,39 @@ if ( $delay and not $delay =~ /^\d{1,3}$/ ) { > } > > if ($op and $op eq "send_alert"){ >- my @ordernums = $input->param("claim_for");# FIXME: Fallback values? >- my $err; >- eval { >- $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value? >- if ( not ref $err or not exists $err->{error} ) { >- AddClaim ( $_ ) for @ordernums; >+ my @claim_for = $input->param('claim_for'); # FIXME: Fallback values? >+ my (@ordernums, @not_claimed); >+ if (not $can_claim_for_all) { >+ foreach my $ordernumber (@claim_for) { >+ my $order = GetOrder($ordernumber); >+ if (CanUserManageBasket($loggedinuser, $order->{basketno}, $userflags)) { >+ push @ordernums, $ordernumber; >+ } else { >+ push @not_claimed, $ordernumber; >+ } > } >- }; >- if ( $@ ) { >- $template->param(error_claim => $@); >- } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) { >- $template->{VARS}->{'error_claim'} = "no_email"; > } else { >- $template->{VARS}->{'info_claim'} = 1; >+ @ordernums = @claim_for; > } >+ if (scalar @ordernums > 0) { >+ my $err; >+ eval { >+ $err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value? >+ if ( not ref $err or not exists $err->{error} ) { >+ foreach my $ordernumber (@ordernums) { >+ AddClaim($ordernumber); >+ } >+ } >+ }; >+ if ( $@ ) { >+ $template->param(error_claim => $@); >+ } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) { >+ $template->param(error_claim => "no_email"); >+ } else { >+ $template->param(info_claim => 1); >+ } >+ } >+ $template->param(not_claimed => \@not_claimed); > } > > my @parameters = ( $delay, $branch ); >@@ -154,8 +193,13 @@ if ($estimateddeliverydateto_dt) { > my @lateorders = GetLateOrders( @parameters ); > > my $total; >-foreach (@lateorders){ >- $total += $_->{subtotal}; >+foreach my $order (@lateorders){ >+ if ( (not $can_claim_for_all) >+ and (not CanUserManageBasket($loggedinuser, $order->{basketno}, $userflags)) >+ ) { >+ $order->{cannot_claim} = 1; >+ } >+ $total += $order->{subtotal}; > } > > my @letters; >diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >index cccbff2..91b128c 100644 >--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql >+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >@@ -20,6 +20,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Lieferungen verwalten'), > (11, 'budget_add_del', 'Konten hinzufügen/ändern, aber bestehende nicht ändern'), > (11, 'budget_manage_all', 'Alle Konten verwalten'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'Nachrichten für OPAC und Dienstoberfläche verfassen'), > (13, 'label_creator', 'Etiketten und Barcodes aus Katalog- und Benutzerdaten erstellen'), > (13, 'edit_calendar', 'SchlieÃtage eintragen'), >diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql >index 0c9c952..2f8e05a 100644 >--- a/installer/data/mysql/en/mandatory/userpermissions.sql >+++ b/installer/data/mysql/en/mandatory/userpermissions.sql >@@ -20,6 +20,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Manage orders & basket'), > (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), > (11, 'budget_manage_all', 'Manage all budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'Write news for the OPAC and staff interfaces'), > (13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'), > (13, 'edit_calendar', 'Define days when the library is closed'), >diff --git a/installer/data/mysql/es-ES/mandatory/userpermissions.sql b/installer/data/mysql/es-ES/mandatory/userpermissions.sql >index 0c9c952..2f8e05a 100644 >--- a/installer/data/mysql/es-ES/mandatory/userpermissions.sql >+++ b/installer/data/mysql/es-ES/mandatory/userpermissions.sql >@@ -20,6 +20,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Manage orders & basket'), > (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), > (11, 'budget_manage_all', 'Manage all budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'Write news for the OPAC and staff interfaces'), > (13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'), > (13, 'edit_calendar', 'Define days when the library is closed'), >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >index 7add197..268d34d 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >@@ -37,6 +37,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Gérer les réceptions'), > (11, 'budget_add_del', 'Ajouter et supprimer les budgets (mais pas modifier)'), > (11, 'budget_manage_all', 'Gérer tous les budgets'), >+ (11, 'order_claim_for_all', 'Réclamer toutes les commandes'), > (13, 'manage_csv_profiles', 'Gérer les profils d''export CSV'), > (13, 'moderate_tags', 'Modérer les tags des adhérents'), > (13, 'rotating_collections', 'Gérer les collections tournantes'), >diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql >index 9f8d7f8..acab5ce 100644 >--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql >+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql >@@ -22,6 +22,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Gestisci arrivi'), > (11, 'budget_add_del', 'Aggiungi e cancella budgets (senza modificarli)'), > (11, 'budget_manage_all', 'Gestisci tutti i budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'Scrivi le news per l\'OPAC e per l\'interfaccia staff'), > (13, 'label_creator', 'Crea etichette da stampare e barcodes dal catalogo e dai dati degli utenti'), > (13, 'edit_calendar', 'Definisci i giorni di chiusura della biblioteca'), >diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >index 41388df..c4c0489 100644 >--- a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql >@@ -40,6 +40,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Administrere bestillinger og kurver'), > (11, 'budget_add_del', 'Legge til og slette budsjetter (men ikke endre budsjetter)'), > (11, 'budget_manage_all', 'Administrere alle budsjetter'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'Legge ut nyhter i OPACen og det interne grensesnittet'), > (13, 'label_creator', 'Lage etiketter og strekkoder basert pÃ¥ bibliografiske poster og lÃ¥nerdata'), > (13, 'edit_calendar', 'Definere dager da biblioteket er stengt'), >diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >index a3d487d..a421069 100644 >--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >@@ -20,6 +20,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Manage orders & basket'), > (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), > (11, 'budget_manage_all', 'Manage all budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'RTworzeniei publikowanie wiadomoÅci w interfejsie bibliotekarza i OPAC'), > (13, 'label_creator', 'Create printable labels and barcodes from catalog and patron data'), > (13, 'edit_calendar', 'Define days when the library is closed'), >diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >index f7bf478..6b3fe2d 100644 >--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >@@ -44,6 +44,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Manage orders & basket'), > (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), > (11, 'budget_manage_all', 'Manage all budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'ÐапиÑание новоÑÑей Ð´Ð»Ñ ÑлекÑÑонного каÑалога и инÑеÑÑейÑа библиоÑекаÑей'), > (13, 'label_creator', 'Создание пеÑаÑнÑÑ Ð½Ð°ÐºÐ»ÐµÐµÐº и ÑÑÑиÑкодов из каÑалога и Ñ Ð´Ð°Ð½Ð½Ñми о полÑзоваÑелÑÑ'), > (13, 'edit_calendar', 'ÐпÑеделение дней, когда библиоÑека закÑÑÑа'), >diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >index deae407..f3b0c37 100644 >--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >@@ -44,6 +44,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (11, 'order_receive', 'Manage orders & basket'), > (11, 'budget_add_del', 'Add and delete budgets (but cant modify budgets)'), > (11, 'budget_manage_all', 'Manage all budgets'), >+ (11, 'order_claim_for_all', 'Claim for all orders'), > (13, 'edit_news', 'ÐапиÑÐ°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ð½ Ð´Ð»Ñ ÐµÐ»ÐµÐºÑÑонного каÑÐ°Ð»Ð¾Ð³Ñ Ñа ÑнÑеÑÑейÑÑ Ð±ÑблÑоÑекаÑÑв'), > (13, 'label_creator', 'СÑвоÑÐµÐ½Ð½Ñ Ð´ÑÑÐºÐ¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°ÐºÐ»ÐµÐ¹Ð¾Ðº Ñ ÑÑÑиÑ-кодÑв з каÑÐ°Ð»Ð¾Ð³Ñ Ñа з даними пÑо коÑиÑÑÑваÑÑв'), > (13, 'edit_calendar', 'ÐизнаÑÐµÐ½Ð½Ñ Ð´Ð½Ñв, коли бÑблÑоÑека закÑиÑа'), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 8cad05b..147651b 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6373,6 +6373,17 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > } > > >+$DBversion = "XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do(" >+ INSERT IGNORE INTO permissions (module_bit, code, description) >+ VALUES (11, 'order_claim_for_all', 'Claim for all orders') >+ "); >+ >+ print "Upgrade to $DBversion done (Add permission order_claim_for_all)\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index b146060..6b02e89 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -55,6 +55,19 @@ $(document).ready(function() { > <div class="error">[% error_claim %]</div> > [% END %] > [% END %] >+[% IF not_claimed.size %] >+ <div class="error"> >+ <p> >+ The following orders were not claimed because you are not >+ authorised to claim for them: >+ </p> >+ <ul> >+ [% FOREACH ordernumber IN not_claimed %] >+ <li>[% ordernumber %]</li> >+ [% END %] >+ </ul> >+ </div> >+[% END %] > [% IF info_claim %] > <div class="dialog message">Email has been sent.</div> > [% END %] >@@ -131,7 +144,7 @@ $(document).ready(function() { > <td>[% lateorder.claims_count %]</td> > <td>[% lateorder.claimed_date %]</td> > <td> >- [% UNLESS lateorder.budget_lock %] >+ [% UNLESS lateorder.cannot_claim %] > <input type="checkbox" class="checkbox" name="claim_for" value="[% lateorder.ordernumber %]" booksellerid="[% lateorder.supplierid %]"/> > [% END %] > </td> >-- >1.7.2.5
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 7292
:
9618
|
10968
|
11284
|
14518
|
21354
|
25078
|
25079
|
26355
|
26356
|
26357
|
26677
|
28462
|
28463
|
28464
|
28465
|
28484
|
28485
|
28486
|
28487
|
30341
|
30342
|
30343
|
30344
|
30345