From eb220b5046be61bda1379af1468b0c91a1d0db8c Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Thu, 16 May 2019 18:07:12 +0200
Subject: [PATCH] Bug 22210: Mana config - Replace firstname and lastname with
 name

I've applied a patch on Mana test server. If you want to
test with your own Mana instance, do the folowing:
  - checkout bug/22210 branch from
    http://git.biblibre.com/biblibre/koha-mana.git
  - run these sql queries on Mana database (we need an update DB method
    i think):
    - ALTER TABLE librarian ADD COLUMN name VARCHAR(50) AFTER email
    - UPDATE librarian SET name = (SELECT CONCAT(firstname, ' ',
      lastname))
    - ALTER TABLE librarian DROP COLUMN firstname
    - ALTER TABLE librarian DROP COLUMN lastname

Test plan
  - set mana_config to "https://mana-test.koha-community.org",
  - go to admin > Share content with Mana KB,
  - set "Use Mana KB for sharing content" to yes,
  - save,
  - in the 2nd fieldset, enter a name and email,
  - click on send to Mana KB,
  - check that you got a token,
  - you should receive an email (Mana KB registration)
  - check the name is correct

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 admin/share_content.pl                                |  6 ++----
 .../prog/en/modules/admin/share_content.tt            | 11 ++++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/admin/share_content.pl b/admin/share_content.pl
index 475771aad8..2b9bd855e8 100755
--- a/admin/share_content.pl
+++ b/admin/share_content.pl
@@ -58,12 +58,10 @@ if ( $op eq 'reset' ) {
 }
 
 if ( $op eq 'send' ) {
-    my $name = $query->param('lastname');
-    my $firstname = $query->param('firstname');
+    my $name = $query->param('name');
     my $email = $query->param('email');
 
-    my $content = to_json({firstname => $firstname,
-                           lastname => $name,
+    my $content = to_json({name => $name,
                            email => $email});
 
     my $mana_ip = C4::Context->config('mana_config');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index 11d4e6c196..601b2a32d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -91,7 +91,7 @@
                 [% UNLESS Koha.Preference('ManaToken') %]
                     <h3>Configure Mana KB</h3>
 
-                    <p>Once you have enabled Mana it must be configured. Type your first name, last name, and email address and submit. This will send a account creation request to Mana KB that will respond back with a Mana KB token (an encrypted ID that uniquely identifies your Koha installation). This token will automatically be saved in your database. After that you will receive an email. Read it and follow the instructions.</p>
+                    <p>Once you have enabled Mana it must be configured. Type your name, and email address and submit. This will send a account creation request to Mana KB that will respond back with a Mana KB token (an encrypted ID that uniquely identifies your Koha installation). This token will automatically be saved in your database. After that you will receive an email. Read it and follow the instructions.</p>
                 [% END %]
 
                 [% IF Koha.Preference('ManaToken') %]
@@ -116,12 +116,9 @@
                         <fieldset class="rows" id="mana_subscription">
                             <ol>
                                 <li>
-                                    <label for="firstname">First name: </label>
-                                    <input id="firstname" type="text" name="firstname" />
-                                </li>
-                                <li>
-                                    <label for="lastname">Last name: </label>
-                                    <input id="lastname" type="text" name="lastname" />
+                                    <label for="name">Your name: </label>
+                                    <input id="name" type="text" name="name" />
+                                    <div class="hint">Enter a personal or organization name.</div>
                                 </li>
                                 <li>
                                     <label for="email">Email: </label>
-- 
2.20.1