From b742d6f1303e2d96afb448807d13b4c23daeaf81 Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
Date: Tue, 2 Oct 2018 15:27:56 +0000
Subject: [PATCH] Bug 17047: Fix reports sharing

---
 .../en/modules/reports/guided_reports_start.tt     | 132 ++++++++++-----------
 1 file changed, 63 insertions(+), 69 deletions(-)

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 a7dc686..7dd9f68 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
@@ -349,85 +349,78 @@ canned reports and writing custom SQL reports.</p>
                 <div id="note-error" class="alert alert-danger" role="alert">
                     Please enter a report name and descriptive note before sharing (minimum 20 characters)
                 </div>
-                [% IF ( languages_loop ) %]
-                    [% UNLESS ( one_language_enabled ) %]
-                        <div class="shared_infos rows">
-                                <li> <span class="label">Id: </span><div id="shared_id"></div>
-                                </li>
-                                <li> <span class="label">Name: </span><div id="shared_name"></div>
-                                </li>
-                                <li> <span class="label">SQL: </span><div id="shared_sql"></div>
-                                </li>
-                                <li> <span class="label">Group: </span><div id="shared_group"></div>
-                                </li>
-                                <li> <span class="label">Type: </span><div id="shared_type"></div>
-                                </li>
-                                <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" >
-                                <input type="hidden" name="phase" value="Share">
-
-                                <fieldset class="shared_infos">
-                                    <label for="mana_language">Language:</label>
-                                    <select id="mana_language" name="mana_language">
-                                        [% FOREACH languages_loo IN languages_loop %]
-                                            [% IF ( languages_loo.group_enabled ) %]
-                                                [% IF ( languages_loo.plural ) %]
-                                                    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
-                                                        [% IF ( sublanguages_loo.enabled ) %]
-                                                            [% IF ( sublanguages_loo.sublanguage_current ) %]
-                                                                <option value="[% languages_loo.rfc4646_subtag %]" selected>
-                                                                    [% sublanguages_loo.native_description %]
-                                                                    [% sublanguages_loo.script_description %]
-                                                                    [% sublanguages_loo.region_description %]
-
-                                                                    [% sublanguages_loo.variant_description %]
-                                                                    ([% sublanguages_loo.rfc4646_subtag %])
-                                                                </option>
-                                                            [% ELSE %]
-                                                                <option value="[% languages_loo.rfc4646_subtag %]">
-                                                                    [% sublanguages_loo.native_description %]
-                                                                    [% sublanguages_loo.script_description %]
-                                                                    [% sublanguages_loo.region_description %]
-                                                                    [% sublanguages_loo.variant_description %]
-                                                                    ([% sublanguages_loo.rfc4646_subtag %])
-                                                                </option>
-                                                            [% END %]
-                                                        [% END %]
-                                                    [% END %]
-                                                [% ELSE %]
-                                                    [% IF ( languages_loo.group_enabled ) %]
-                                                        [% IF ( languages_loo.current ) %]
+                <div class="shared_infos rows">
+                    <li><span class="label">Id: </span><div id="shared_id"></div></li>
+                    <li><span class="label">Name: </span><div id="shared_name"></div></li>
+                    <li><span class="label">SQL: </span><div id="shared_sql"></div></li>
+                    <li><span class="label">Group: </span><div id="shared_group"></div></li>
+                    <li><span class="label">Type: </span><div id="shared_type"></div></li>
+                    <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" >
+                        <input type="hidden" name="phase" value="Share">
+
+                        [% IF (languages_loop) %]
+                            <fieldset class="shared_infos">
+                                <label for="mana_language">Language:</label>
+                                <select id="mana_language" name="mana_language">
+                                    [% FOREACH languages_loo IN languages_loop %]
+                                        [% IF ( languages_loo.group_enabled ) %]
+                                            [% IF ( languages_loo.plural ) %]
+                                                [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
+                                                    [% IF ( sublanguages_loo.enabled ) %]
+                                                        [% IF ( sublanguages_loo.sublanguage_current ) %]
                                                             <option value="[% languages_loo.rfc4646_subtag %]" selected>
-                                                                [% IF ( languages_loo.native_description ) %]
-                                                                    [% languages_loo.native_description %]
-                                                                [% ELSE %]
-                                                                    [% languages_loo.rfc4646_subtag %]
-                                                                [% END %]
+                                                                [% sublanguages_loo.native_description %]
+                                                                [% sublanguages_loo.script_description %]
+                                                                [% sublanguages_loo.region_description %]
+
+                                                                [% sublanguages_loo.variant_description %]
+                                                                ([% sublanguages_loo.rfc4646_subtag %])
                                                             </option>
                                                         [% ELSE %]
                                                             <option value="[% languages_loo.rfc4646_subtag %]">
-                                                                [% IF ( languages_loo.native_description ) %]
-                                                                    [% languages_loo.native_description %]
-                                                                [% ELSE %]
-                                                                    [% languages_loo.rfc4646_subtag %]
-                                                                [% END %]
+                                                                [% sublanguages_loo.native_description %]
+                                                                [% sublanguages_loo.script_description %]
+                                                                [% sublanguages_loo.region_description %]
+                                                                [% sublanguages_loo.variant_description %]
+                                                                ([% sublanguages_loo.rfc4646_subtag %])
                                                             </option>
                                                         [% END %]
                                                     [% END %]
                                                 [% END %]
+                                            [% ELSE %]
+                                                [% IF ( languages_loo.group_enabled ) %]
+                                                    [% IF ( languages_loo.current ) %]
+                                                        <option value="[% languages_loo.rfc4646_subtag %]" selected>
+                                                            [% IF ( languages_loo.native_description ) %]
+                                                                [% languages_loo.native_description %]
+                                                            [% ELSE %]
+                                                                [% languages_loo.rfc4646_subtag %]
+                                                            [% END %]
+                                                        </option>
+                                                    [% ELSE %]
+                                                        <option value="[% languages_loo.rfc4646_subtag %]">
+                                                            [% IF ( languages_loo.native_description ) %]
+                                                                [% languages_loo.native_description %]
+                                                            [% ELSE %]
+                                                                [% languages_loo.rfc4646_subtag %]
+                                                            [% END %]
+                                                        </option>
+                                                    [% END %]
+                                                [% END %]
                                             [% END %]
                                         [% END %]
-                                    </select>
-                                    <input type="hidden" id="reportid" name="reportid" value="[% savedreport.id %]"/>
-                                </fieldset>
-                            </form>
-                        </div>
-                    [% END %]
-                [% END %]
+                                    [% END %]
+                                </select>
+                            </fieldset>
+                        [% ELSE %]
+                            <input type="hidden" name="mana_language" value="[% lang %]">
+                        [% END %]
+                        <input type="hidden" id="reportid" name="reportid"/>
+                    </form>
+                </div>
             </div>
             <div class="modal-footer">
                 <button class="btn" id="ManaCloseButton" data-dismiss="modal" aria-hidden="true">Close</button>
@@ -1264,6 +1257,7 @@ $(document).ready(function() {
                     $("#note-error").show();
                 }
                 else{
+                    $("#reportid").val($(this).closest("tr").find(".report_id").text());
                     $("#shared_id").html($(this).closest("tr").find(".report_id").text());
                     $("#shared_name").html($(this).closest("tr").find(".report_name").text());
                     $("#shared_sql").html($(this).closest("tr").find(".report_sql").val());
-- 
2.7.4