From 7e00748cae0eb6a642a345a724cffa60b3742ecf Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Thu, 17 Jan 2019 11:35:48 +0100
Subject: [PATCH] Bug 17047: QA fixes:   - don't search subscriptions when mana
 is disabled,   - subscription detail page: don't show share button or search
 link if Mana is disabled,   - fix report sharing,   - submit report search
 form by pressing enter,   - add a waitting mouse cursor while searching,   -
 keep the search form above report results table,   - avoid warnings in
 subscription-add

foo
---
 .../includes/mana/mana-subscription-search-result.inc  |  1 +
 .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 18 ++++++++++++------
 .../intranet-tmpl/prog/en/includes/serials-menu.inc    |  2 +-
 .../intranet-tmpl/prog/en/includes/serials-toolbar.inc |  2 +-
 .../prog/en/modules/reports/guided_reports_start.tt    |  8 ++++++--
 koha-tmpl/intranet-tmpl/prog/js/subscription-add.js    |  6 ++++--
 reports/guided_reports.pl                              |  4 +++-
 serials/subscription-add.pl                            |  2 +-
 8 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc
index 891ce4c..4570191 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc
@@ -2,6 +2,7 @@
 [% USE Koha %]
 [% USE AuthorisedValues %]
 [% USE Branches %]
+[% USE raw %]
 [% INCLUDE 'mana.inc' %]
 <script type="text/javascript">
 //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
index 446fe7b..cc1b083 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
@@ -124,12 +124,16 @@
                     <h3 id="mana_search_result_label"> Mana Search</h3>
                 </div>
                 <div>
-                    <form id="search_form" style="margin-left: 5%">
-                        Please enter a few key words:
-                        <input type=text id=mana_search_field>
-                        <input type=button class="mana_search_button" value="Search">
-                    </form>
                     <div class="modal-body">
+                        <fieldset>
+                            <form id="mana_search_form" style="margin-left: 5%">
+                                Please enter a few key words:
+                                <input type="text" id="mana_search_field">
+                                <input type="submit" class="mana_search_button" value="Search">
+                            </form>
+                        </fieldset>
+                        <div class="mana_result_content">
+                        </div>
                     </div>
                 </div>
             </div>
@@ -158,6 +162,7 @@
     }
 
     function mana_search( textquery ){
+        $(document.body).css({'cursor' : 'wait'});
         $.ajax({
             type: "POST",
             url: "/cgi-bin/koha/svc/mana/search",
@@ -165,7 +170,8 @@
             dataType: "html",
         })
         .done( function( result ) {
-            $("#mana_search_result .modal-body").html(result);
+            $(document.body).css({'cursor' : 'default'});
+            $("#mana_search_result .modal-body .mana_result_content").html(result);
             $("#mana_search_result_label").text(_("Results from Mana Knowledge Base"));
             $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults,{
                 "sPaginationType":"four_button",
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
index 257c429..af85c11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
@@ -31,7 +31,7 @@
         </a>
     </li>
     <li><a href="/cgi-bin/koha/serials/add_fields.pl">Add subscription fields</a></li>
-    [% IF Koha.Preference('Mana') %]
+    [% IF Koha.Preference('Mana') == 1 %]
         <li><a href="/cgi-bin/koha/serials/serials-search.pl?mana=1">Search on Mana</a></li>
     [% END %]
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
index 281af8e..e8aabde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
@@ -7,7 +7,7 @@
             [% ELSE %]
                 <div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
             [% END %]
-            [% IF Koha.Preference('Mana') and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
+            [% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
                 [% IF one_language_enabled==0 or mana_id %]
                     <div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other librairies. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default btn-sm"><i class="fa fa-share-alt"></i> Share</a></div>
                 [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 50df03b..b8c4b0c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -364,7 +364,7 @@ canned reports and writing custom SQL reports.</p>
                     <li><span class="label">Notes: </span><div id="shared_notes"></div></li>
                 </div>
                 <div class="rows">
-                    <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl?phase=Share" class="validated" >
+                    <form method="post" id="mana_share_form" action="/cgi-bin/koha/reports/guided_reports.pl" class="validated" >
                         <input type="hidden" name="phase" value="Share">
 
                         [% IF (languages_loop) %]
@@ -1490,7 +1490,11 @@ canned reports and writing custom SQL reports.</p>
             });
 
             $('div#ManaShareButton').click(function() {
-                window.location="/cgi-bin/koha/reports/guided_reports.pl?phase=Share";
+                $("#mana_share_form").submit();
+            });
+
+            $("#mana_search_form").submit(function(e){
+                e.preventDefault();
             });
         });
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
index da8abd1..776c9fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
@@ -507,7 +507,9 @@ function mana_use(mana_id){
 }
 
 $(document).ready(function() {
-    mana_search();
+    if ( mana_enabled == 1 ) {
+        mana_search();
+    }
     $("#displayexample").hide();
     $("#mana_search_result").modal("hide");
     $("#aqbooksellerid").on('keypress', function(e) {
@@ -617,7 +619,7 @@ $(document).ready(function() {
     });
     $("#subscription_add_next").on("click",function(){
         if ( Check_page1() ){
-            if ( mana_enabled ) {
+            if ( mana_enabled == 1 ) {
                 mana_search();
             }
             show_page_2();
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 511d939..80edc2a 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -678,7 +678,9 @@ elsif ( $phase eq 'Save Report' ) {
 }
 
 elsif ($phase eq 'Share'){
-    my $result = Koha::SharedContent::send_entity($input->param('mana_language'), $borrowernumber, scalar $input->param('reportid'), 'report');
+    my $lang = $input->param('mana_language') || '';
+    my $reportid = $input->param('reportid');
+    my $result = Koha::SharedContent::send_entity($lang, $borrowernumber, $reportid, 'report');
     if ( $result ) {
         print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&manamsg=".$result->{msg});
     }else{
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 2edb78d..491f9fb 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -52,7 +52,7 @@ my $sub_length;
 my $permission =
   ( $op eq 'modify' || $op eq 'modsubscription' ) ? "edit_subscription" : "create_subscription";
 
-my ($template, $loggedinuser, $cookie)
+our ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tt",
 				query => $query,
 				type => "intranet",
-- 
2.7.4