Bugzilla – Attachment 21960 Details for
Bug 10092
Small improvements on serial missinglist and receivedlist
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10092: Small improvements on serial missinglist and receivedlist
Bug-10092-Small-improvements-on-serial-missinglist.patch (text/plain), 2.48 KB, created by
Biblibre Sandboxes
on 2013-10-11 10:18:43 UTC
(
hide
)
Description:
Bug 10092: Small improvements on serial missinglist and receivedlist
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2013-10-11 10:18:43 UTC
Size:
2.48 KB
patch
obsolete
>From 8eb57bbf9a4ec71364ed0a848c08eb74e2aa5068 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 22 Apr 2013 11:53:28 +0200 >Subject: [PATCH] Bug 10092: Small improvements on serial missinglist and receivedlist > >Builds upon report 8896 with changes for missinglist. >Similar changes for receivedlist to be consistent. > >Test plan: >Go to serial collection information. >Edit serials. >Toggle the status through all possible values. >On another tab or in the db, check missinglist and receivedlist (subscription >detail tab Summary). > >Signed-off-by: Koha Team Amu <koha.aixmarseille@gmail.com> >--- > C4/Serials.pm | 21 ++++++++++++++------- > 1 files changed, 14 insertions(+), 7 deletions(-) > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index a1ce054..c012d80 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -1131,18 +1131,25 @@ sub ModSerialStatus { > $sth = $dbh->prepare($query); > $sth->execute($subscriptionid); > my ( $missinglist, $recievedlist ) = $sth->fetchrow; >- if ( $status == 2 ) { >+ >+ #Arrived: add to received list, remove from missing >+ if($status==2) { > $recievedlist .= "; $serialseq" > if $recievedlist!~/(^|;)\s*$serialseq(?=;|$)/; >+ $missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g; > } >- # in case serial has been previously marked as missing >- if (grep /$status/, (1,2,3,7)) { >+ #Expected,late,claimed: remove optionally from received+missing >+ if (grep /$status/, (1,3,7)) { >+ $recievedlist=~ s/(^|;)\s*$serialseq(?=;|$)//g; > $missinglist=~ s/(^|;)\s*$serialseq(?=;|$)//g; > } >- $missinglist .= "; $serialseq" >- if $status==4 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; >- $missinglist .= "; not issued $serialseq" >- if $status==5 && $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; >+ #Missing, not available: add to missing, remove from received >+ #No longer putting additional text into missing field >+ if($status==4 || $status==5) { >+ $missinglist .= "; $serialseq" >+ if $missinglist!~/(^|;)\s*$serialseq(?=;|$)/; >+ $recievedlist=~ s/(^|;)\s*$serialseq(?=;|$)//g; >+ } > > $query = "UPDATE subscriptionhistory SET recievedlist=?, missinglist=? WHERE subscriptionid=?"; > $sth = $dbh->prepare($query); >-- >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 10092
:
17576
|
17580
|
21960
|
21961
|
22246
|
22247