Attachment 80200 Details for Bug 17047 – Bug 17047: Fix reports sharing

[patch] Bug 17047: Fix reports sharing

Bug-17047-Fix-reports-sharing.patch (text/plain), 12.52 KB, created by Michal Denar on 2018-10-08 07:23:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Denar

Created: 2018-10-08 07:23:30 UTC

Size: 12.52 KB

patch

obsolete

>From 8082f0c3c4aaa154354571b1d2cbc595bea4737b 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
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>---
> .../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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17047: 56175 | 56176 | 56177 | 56178 | 56179 | 56180 | 56181 | 59728 | 59729 | 59931 | 61905 | 62045 | 62046 | 62047 | 62048 | 62049 | 62050 | 62051 | 62052 | 62053 | 62054 | 62075 | 62465 | 62475 | 62485 | 62540 | 62542 | 62543 | 62544 | 62545 | 62546 | 62547 | 62548 | 62549 | 62550 | 62551 | 62552 | 62553 | 62589 | 62591 | 62592 | 62593 | 62594 | 62595 | 62596 | 62597 | 62598 | 62599 | 62603 | 62604 | 62605 | 62606 | 62607 | 62768 | 63476 | 63601 | 63618 | 63619 | 63620 | 63621 | 63622 | 63623 | 64484 | 64530 | 64618 | 64619 | 64620 | 64621 | 64622 | 64623 | 64624 | 64625 | 64626 | 64627 | 64628 | 64629 | 64630 | 64631 | 64632 | 64633 | 64634 | 64635 | 64636 | 64637 | 64638 | 64639 | 64640 | 64641 | 64642 | 64643 | 64648 | 64649 | 64650 | 64651 | 64652 | 64653 | 64654 | 64706 | 64962 | 65058 | 65059 | 65060 | 65061 | 65062 | 65063 | 65064 | 65065 | 65773 | 66667 | 66668 | 66987 | 67003 | 67004 | 67005 | 67006 | 67009 | 67010 | 67011 | 67012 | 67013 | 67014 | 67015 | 67016 | 67017 | 67018 | 67019 | 67020 | 67021 | 67022 | 67023 | 69034 | 69035 | 69036 | 69037 | 69038 | 69039 | 69040 | 69041 | 69091 | 70203 | 70204 | 70205 | 70206 | 70208 | 70209 | 70210 | 70211 | 70561 | 70874 | 72660 | 72661 | 72662 | 72663 | 72664 | 72665 | 72666 | 72667 | 72668 | 72669 | 72670 | 73699 | 73737 | 73738 | 73739 | 73740 | 73741 | 73742 | 73743 | 73744 | 73745 | 73746 | 73747 | 73748 | 73975 | 73976 | 73977 | 73978 | 73979 | 73980 | 73981 | 73982 | 73983 | 73984 | 73985 | 73986 | 76673 | 76674 | 76675 | 76676 | 76677 | 76678 | 76679 | 76680 | 76681 | 76682 | 76683 | 76684 | 78215 | 78216 | 78217 | 78218 | 78219 | 78220 | 78221 | 78222 | 78223 | 78224 | 78225 | 78226 | 78227 | 78228 | 78229 | 79868 | 79869 | 79870 | 79871 | 79872 | 79874 | 79877 | 79878 | 79879 | 79880 | 79881 | 79882 | 79883 | 79884 | 79885 | 79886 | 79887 | 79888 | 79922 | 79923 | 79924 | 79925 | 79926 | 79927 | 79928 | 79929 | 79930 | 79931 | 79932 | 79933 | 79934 | 79935 | 79936 | 79937 | 79938 | 79939 | 80183 | 80184 | 80185 | 80186 | 80187 | 80188 | 80189 | 80190 | 80191 | 80192 | 80193 | 80194 | 80195 | 80196 | 80197 | 80198 | 80199 | 80200 | 80471 | 80472 | 80473 | 80907 | 80908 | 80909 | 80910 | 80911 | 80912 | 80913 | 80914 | 80915 | 80916 | 80917 | 80918 | 80919 | 80920 | 80921 | 80922 | 80923 | 80924 | 81935 | 81936 | 81937 | 81938 | 81939 | 81940 | 81941 | 81942 | 81943 | 81944 | 81945 | 81946 | 81947 | 81948 | 81949 | 81950 | 81951 | 81952 | 81968 | 83863 | 83864 | 83865 | 83866 | 83867 | 83868 | 83869 | 83870 | 83871 | 83872 | 83873 | 83874 | 83875 | 83876 | 83877 | 83878 | 83879 | 83880 | 83881 | 83892 | 83893 | 83894 | 83895 | 83896 | 83897 | 83898 | 83899 | 83900 | 83901 | 83902 | 83903 | 83904 | 83905 | 83906 | 83907 | 83908 | 83909 | 83910 | 83911 | 83912 | 84142 | 84145 | 84210 | 84260 | 84261 | 84262 | 84263 | 84264 | 84265 | 84323 | 84324 | 84325 | 84326 | 84327 | 84328 | 84329 | 84332