Attachment 49454 Details for Bug 16125 – Bug 16125: Remove the flagged boolean in circ/circulation.tt

[patch] Bug 16125: Remove the flagged boolean in circ/circulation.tt

Bug-16125-Remove-the-flagged-boolean-in-circcircul.patch (text/plain), 4.54 KB, created by Marc Véron on 2016-03-23 16:29:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2016-03-23 16:29:20 UTC

Size: 4.54 KB

patch

obsolete

>From 535c15ca85435ace3e04f5afe55ea4d5c3c8f827 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 23 Mar 2016 16:04:47 +0000
>Subject: [PATCH] Bug 16125: Remove the flagged boolean in circ/circulation.tt
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Before 15632, flagged was passed in any cases: GetMessages returned an
>arrayref, so:
>  my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
>  if($bor_messages_loop){ $template->param(flagged => 1 ); }
>set 'flagged'.
>
>It seems that this variable is not needed as it's always set.
>
>Test plan:
>Confirm that the "Add a new message" link is always displayed (even if
>no message exist).
>Note that a "Attention" is displayed but should not, that already
>existed before bug 15632.
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>---
> circ/circulation.pl                                       |    7 -------
> .../intranet-tmpl/prog/en/modules/circ/circulation.tt     |   13 ++-----------
> 2 files changed, 2 insertions(+), 18 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 75799bd..e527b7e 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -288,7 +288,6 @@ if ($borrowernumber) {
>     {
>         #borrowercard expired, no issues
>         $template->param(
>-            flagged  => "1",
>             noissues => ($force_allow_issue) ? 0 : "1",
>             forceallow => $force_allow_issue,
>             expired => "1",
>@@ -301,7 +300,6 @@ if ($borrowernumber) {
>     {
>         # borrower card soon to expire warn librarian
>         $template->param( "warndeparture" => $borrower->{dateexpiry} ,
>-                          flagged         => "1"
>                         );
>         if (C4::Context->preference('ReturnBeforeExpiry')){
>             $template->param("returnbeforeexpiry" => 1);
>@@ -470,7 +468,6 @@ if ($borrowernumber) {
> #title
> my $flags = $borrower->{'flags'};
> foreach my $flag ( sort keys %$flags ) {
>-    $template->param( flagged=> 1);
>     $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
>     if ( $flags->{$flag}->{'noissues'} ) {
>         $template->param(
>@@ -563,10 +560,6 @@ my $patron_messages = Koha::Patron::Messages->search(
>     }
> );
> 
>-if( $librarian_messages->count or $patron_messages->count ) {
>-    $template->param(flagged => 1)
>-}
>-
> my $fast_cataloging = 0;
> if (defined getframeworkinfo('FA')) {
>     $fast_cataloging = 1 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index eaae5d7..57e5cf2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -409,7 +409,7 @@ $(document).ready(function() {
> </form>
> 
> [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
>-    [% UNLESS flagged && noissues %]
>+    [% UNLESS noissues %]
>         <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
>     [% END %]
> [% END %]
>@@ -607,12 +607,7 @@ No patron matched <span class="ex">[% message %]</span>
> [% END %]
> 
> [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
>-[% IF ( flagged ) %]
> <div class="yui-u first">
>-[% ELSE %]
>-<div>
>-
>-[% END %]
> 
> <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
>     <input type="hidden" name="restoreduedatespec" />
>@@ -638,7 +633,7 @@ No patron matched <span class="ex">[% message %]</span>
>     [% END %]
>     <button type="submit" class="btn">Check out</button>
> 
>-    [% UNLESS flagged and noissues %]
>+    [% UNLESS noissues %]
>         <div class="date-select">
>             [% IF NEEDSCONFIRMATION %]
>                 <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
>@@ -713,7 +708,6 @@ No patron matched <span class="ex">[% message %]</span>
>     <div class="yui-u">
> [% END %]
> 
>-    [% IF flagged %]
>         [% IF ( noissues ) %]
>             [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
>                 <div id="circmessages" class="circmessage attention">
>@@ -862,9 +856,6 @@ No patron matched <span class="ex">[% message %]</span>
>         </ul>
>     </div>
> 
>-     [% END %]
>-
>-	
> </div>
> </div>
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16125: 49450 | 49454 | 49463