From e778fb80c118f3cf934268d29acf705b6eb398db 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) various fixes

* 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>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 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 bbefa444bc..51020b6cbe 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 6a4cdf972e..9b95433ea5 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8295,7 +8295,7 @@ if ( CheckVersion($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 a6608d745c..144c2e656a 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 %]
-- 
2.39.5