Attachment #70605 for bug #19957

View | Details | Raw Unified | Return to bug 19957
Collapse All | Expand All




</fieldset>
[% END %]

[% IF ( save_successful ) %]
[% UNLESS ( errors ) %]
</br>
<div id="report_updated">
    <div class="alert alert-info">
        <p>Your report "[% reportname %]" has been saved</p>
    </div>
</div>
[% END %]
[% END %]

[% IF ( editsql ) %]
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated">
<input type="hidden" name="phase" value="Update SQL" />


[% END %]

[% IF ( save_successful ) %]
[% UNLESS ( errors ) %]
<h2>Your report has been saved</h2>
<h4>[% reportname %]</h4>
<ul>
    [% IF ( id ) %]
    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report">Run this report</a></li>
    [% END %]
    <li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports page</a></li>
    <li>Schedule this report to run using the: <a href="/cgi-bin/koha/tools/scheduler.pl">Scheduler tool</a></li>
    <li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Guided reports</a></li>
</ul>
[% END %]
[% END %]

[% IF ( errors ) %]
<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
<div class="dialog alert">

                $('#limitselect').submit();
            });

            $(document).click(function() {
                $('#report_updated').hide();
            });

            $(".goback").on("click",function(e){
                e.preventDefault();
                window.history.back();

Lines 279-284 elsif ( $phase eq 'Update SQL'){ Link Here

(-)a/reports/guided_reports.pl (-1 / +14 lines)
279	'save_successful' => 1,	279	'save_successful' => 1,
280	'reportname' => $reportname,	280	'reportname' => $reportname,
281	'id' => $id,	281	'id' => $id,
		282	'editsql' => 1,
		283	'sql' => $sql,
		284	'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
		285	'notes' => $notes,
		286	'cache_expiry' => $cache_expiry,
		287	'public' => $public,
		288	'usecache' => $usecache,
282	);	289	);
283	logaction( "REPORTS", "MODIFY", $id, "$reportname \| $sql" ) if C4::Context->preference("ReportsLog");	290	logaction( "REPORTS", "MODIFY", $id, "$reportname \| $sql" ) if C4::Context->preference("ReportsLog");
284	}	291	}
Lines 648-653 elsif ( $phase eq 'Save Report' ) { Link Here
648	'save_successful' => 1,	655	'save_successful' => 1,
649	'reportname' => $name,	656	'reportname' => $name,
650	'id' => $id,	657	'id' => $id,
		658	'editsql' => 1,
		659	'sql' => $sql,
		660	'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
		661	'notes' => $notes,
		662	'cache_expiry' => $cache_expiry,
		663	'public' => $public,
		664	'usecache' => $usecache,
651	);	665	);
652	}	666	}
653	}	667	}
654	-

Return to bug 19957

Lines 812-817 Sub report:<select name="subreport"> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-15 / +15 lines)
812	</fieldset>	812	</fieldset>
813	[% END %]	813	[% END %]
814		814
		815	[% IF ( save_successful ) %]
		816	[% UNLESS ( errors ) %]
		817	</br>
		818	<div id="report_updated">
		819	<div class="alert alert-info">
		820	<p>Your report "[% reportname %]" has been saved</p>
		821	</div>
		822	</div>
		823	[% END %]
		824	[% END %]
		825
815	[% IF ( editsql ) %]	826	[% IF ( editsql ) %]
816	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated">	827	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post" class="validated">
817	<input type="hidden" name="phase" value="Update SQL" />	828	<input type="hidden" name="phase" value="Update SQL" />
Lines 854-874 Sub report:<select name="subreport"> Link Here
854		865
855	[% END %]	866	[% END %]
856		867
857	[% IF ( save_successful ) %]
858	[% UNLESS ( errors ) %]
859	<h2>Your report has been saved</h2>
860	<h4>[% reportname %]</h4>
861	<ul>
862	[% IF ( id ) %]
863	<li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Run%20this%20report">Run this report</a></li>
864	[% END %]
865	<li>Access this report from the: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports page</a></li>
866	<li>Schedule this report to run using the: <a href="/cgi-bin/koha/tools/scheduler.pl">Scheduler tool</a></li>
867	<li>Return to: <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Guided reports</a></li>
868	</ul>
869	[% END %]
870	[% END %]
871
872	[% IF ( errors ) %]	868	[% IF ( errors ) %]
873	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">	869	<form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
874	<div class="dialog alert">	870	<div class="dialog alert">
Lines 963-968 Sub report:<select name="subreport"> Link Here
963	$('#limitselect').submit();	959	$('#limitselect').submit();
964	});	960	});
965		961
		962	$(document).click(function() {
		963	$('#report_updated').hide();
		964	});
		965
966	$(".goback").on("click",function(e){	966	$(".goback").on("click",function(e){
967	e.preventDefault();	967	e.preventDefault();
968	window.history.back();	968	window.history.back();