Bugzilla – Attachment 76089 Details for
Bug 12395
Save order line's creator
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12395: Add FK constraint and use patron-title.inc
Bug-12395-Add-FK-constraint-and-use-patron-titlein.patch (text/plain), 3.89 KB, created by
Jonathan Druart
on 2018-06-14 21:12:03 UTC
(
hide
)
Description:
Bug 12395: Add FK constraint and use patron-title.inc
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-06-14 21:12:03 UTC
Size:
3.89 KB
patch
obsolete
>From 5b0302598f3636a2301f092a71e3d6e229625200 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Fri, 8 Jun 2018 10:24:19 +0200 >Subject: [PATCH] Bug 12395: Add FK constraint and use patron-title.inc > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../atomicupdate/Bug-12395-add-column-aqorders.created_by.sql | 1 + > installer/data/mysql/kohastructure.sql | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 7 +------ > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt | 2 +- > 4 files changed, 4 insertions(+), 7 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/Bug-12395-add-column-aqorders.created_by.sql b/installer/data/mysql/atomicupdate/Bug-12395-add-column-aqorders.created_by.sql >index 4d2a0fbf23..84a0f5d48b 100644 >--- a/installer/data/mysql/atomicupdate/Bug-12395-add-column-aqorders.created_by.sql >+++ b/installer/data/mysql/atomicupdate/Bug-12395-add-column-aqorders.created_by.sql >@@ -1,2 +1,3 @@ > ALTER TABLE aqorders ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived; >+ALTER TABLE aqorders ADD CONSTRAINT aqorders_created_by FOREIGN KEY (created_by) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE; > UPDATE aqorders, aqbasket SET aqorders.created_by = aqbasket.authorisedby WHERE aqorders.basketno = aqbasket.basketno; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 76f228f27b..987e44a440 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -3202,6 +3202,7 @@ CREATE TABLE `aqorders` ( -- information related to the basket line items > KEY `budget_id` (`budget_id`), > KEY `parent_ordernumber` (`parent_ordernumber`), > KEY `orderstatus` (`orderstatus`), >+ CONSTRAINT aqorders_created_by FOREIGN KEY (created_by) REFERENCES borrowers (borrowernumber) ON DELETE SET NULL ON UPDATE CASCADE, > CONSTRAINT `aqorders_budget_id_fk` FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE CASCADE ON UPDATE CASCADE, > CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE, > CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 5f4da97c6d..8c6f03c059 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -176,12 +176,7 @@ > <li> > <label for="creator">Ordered by: </label> > <span> >- [% IF creator and (creator.firstname or creator.surname) %] >- [% creator.firstname %] >- [% creator.surname %] >- [% ELSE %] >- No name >- [% END %] >+ [% INCLUDE 'patron-title.inc' patron = creator %] > </span> > </li> > <li><label for="quantity_to_receive">Quantity to receive: </label><span class="label"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >index 072e101959..6d525bff6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt >@@ -13,7 +13,7 @@ > </li> > <li> > <span class="label">Ordered by: </span> >- [% creator.firstname %] [% creator.surname %] >+ [% INCLUDE 'patron-title.inc' patron = creator %] > </li> > <li> > <span class="label">Claims count: </span> >-- >2.11.0
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 12395
:
28754
|
28943
|
30128
|
30129
|
31409
|
31410
|
31411
|
33837
|
33838
|
33839
|
35769
|
35770
|
35771
|
35772
|
35779
|
35780
|
35781
|
35782
|
35864
|
36063
|
36075
|
36076
|
36077
|
36078
|
36079
|
36080
|
40132
|
40133
|
40134
|
40135
|
40136
|
40137
|
40138
|
40139
|
40161
|
43951
|
45387
|
58745
|
58746
|
58747
|
58748
|
58749
|
58750
|
61383
|
61384
|
71344
|
71345
|
71346
|
71347
|
71348
|
71349
|
72720
|
72721
|
72722
|
72723
|
72724
|
72725
|
74207
|
74208
|
74209
|
74210
|
74211
|
74212
|
74276
|
74277
|
74278
|
74279
|
74280
|
74281
|
74282
|
75900
|
75901
|
75902
|
75903
|
75904
|
75905
|
75906
|
75907
|
76074
|
76075
|
76076
|
76077
|
76078
|
76079
|
76080
|
76081
|
76082
|
76083
|
76084
|
76085
|
76086
|
76087
|
76088
| 76089