This fix the form to have always the submit button, and fix security issue in aqplan.pl(authnotrequired set to 1)
Conflicts solved: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl --- admin/aqplan.pl | 4 ++-- .../prog/en/modules/admin/aqplan.tmpl | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index a8771d4..a324e25 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -47,7 +47,7 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user { template_name => "admin/aqplan.tmpl", query => $input, type => "intranet", - authnotrequired => 1, + authnotrequired => 0, flagsrequired => { acquisition => 'planning_manage' }, debug => 1, } @@ -486,4 +486,4 @@ sub _print_to_csv { my $str = $csv->string; print "$str\n"; } -} \ No newline at end of file +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 3660b0f..37dc0c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -135,7 +135,6 @@ Budget & Fund Planning <td></td> </tr> - <!-- TMPL_UNLESS name="budget_period_locked" --> <tr><td> <!-- TMPL_IF NAME="show_actual" --> <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" /> @@ -146,7 +145,6 @@ Budget & Fund Planning </td> <td></td> </tr> - <!-- /TMPL_UNLESS --> </table> </fieldset> -- 1.6.3.3 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches