Bugzilla – Attachment 26664 Details for
Bug 9016
Multi transport types for notices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9016: (follow-up) qa fixes
Bug-9016-follow-up-qa-fixes.patch (text/plain), 3.10 KB, created by
Marcel de Rooy
on 2014-03-28 09:11:02 UTC
(
hide
)
Description:
Bug 9016: (follow-up) qa fixes
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2014-03-28 09:11:02 UTC
Size:
3.10 KB
patch
obsolete
>From 067d8ad7358410be48c66201fecac0d22022a47d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 24 Feb 2014 16:13:35 +0100 >Subject: [PATCH] Bug 9016: (follow-up) qa fixes >Content-Type: text/plain; charset=utf-8 > >* Fixes POD of GetMessageTransportTypes. >* Removes the useless map in GetMessageTransportTypes. >* Textual: "You must specify a title and a content" -> "Please specify title and content". >* Reintroduces << and >> around the field name. >* Change message for the update DB entry. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Letters.pm | 10 +++------- > installer/data/mysql/updatedatabase.pl | 2 +- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- > 3 files changed, 6 insertions(+), 10 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index bbefa44..51020b6 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -851,22 +851,18 @@ ENDSQL > > my @mtt = GetMessageTransportTypes(); > >- returns a list of hashes >+ returns an arrayref of transport types > > =cut > > sub GetMessageTransportTypes { > my $dbh = C4::Context->dbh(); >- my $sth = $dbh->prepare(" >+ my $mtts = $dbh->selectcol_arrayref(" > SELECT message_transport_type > FROM message_transport_types > ORDER BY message_transport_type > "); >- $sth->execute; >- my @mtts = map{ >- $_->[0] >- } @{ $sth->fetchall_arrayref() }; >- return \@mtts; >+ return $mtts; > } > > =head2 _add_attachements >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 3e74cb1..e12307d 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8136,7 +8136,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > } > } > >- print "Upgrade done (Bug 9016: Adds the association table overduerules_transport_types)\n"; >+ print "Upgrade done (Bug 9016: Adds multi transport types management for notices)\n"; > SetVersion($DBversion); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index 3da568d..92c3421 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -34,7 +34,7 @@ $(document).ready(function() { > || ( title.length > 0 && content.length == 0 ) > ) { > var mtt = $(this).find('input[name="message_transport_type"]').val(); >- var msg = _("You must specify a title and a content for %s"); >+ var msg = _("Please specify title and content for %s"); > msg = msg.replace( "%s", mtt ); > alert(msg) > event.preventDefault(); >@@ -95,7 +95,7 @@ $(document).ready(function() { > chaineAj += $(this).val(); > } > } ); >- $(myQuery).insertAtCaret(chaineAj); >+ $(myQuery).insertAtCaret("<<" + chaineAj + ">>"); > } > } > [% END %] >-- >1.7.7.6
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 9016
:
13276
|
20814
|
20815
|
20816
|
20916
|
21164
|
21165
|
21166
|
21167
|
21636
|
21637
|
21638
|
21639
|
22814
|
23272
|
23273
|
23289
|
23290
|
23291
|
23292
|
23293
|
23562
|
23955
|
23956
|
23957
|
23958
|
23959
|
23960
|
24571
|
24572
|
24573
|
24574
|
24575
|
24576
|
25006
|
25123
|
25124
|
25125
|
25126
|
25127
|
25128
|
25129
|
25130
|
25415
|
25416
|
25417
|
25418
|
25419
|
25420
|
25421
|
25422
|
25606
|
25899
|
26182
|
26209
|
26210
|
26211
|
26216
|
26226
|
26233
|
26648
|
26649
|
26650
|
26656
|
26657
|
26658
|
26659
|
26660
|
26661
|
26662
|
26663
|
26664
|
26665
|
26666
|
26667
|
26668
|
26670
|
26672
|
26673
|
27794
|
27795
|
27796
|
27797
|
27798
|
27799
|
27800
|
27801
|
27802
|
27803
|
27804
|
27805
|
27806
|
27807
|
27808
|
27809