[Koha-cvs] koha C4/Search.pm koha-tmpl/intranet-tmpl/defau... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   06/09/13 16:34:28

Modified files:
        C4             : Search.pm 
        koha-tmpl/intranet-tmpl/default/en/catalogue: detail.tmpl 
        koha-tmpl/opac-tmpl/css/en: opac-detail.tmpl 

Log message:
        fix for #1066 : Intranet detail screen shows 'on issue to' for waiting 
items
        
        I've added a reservestatus TMPL_VAR that can be used to show reserve 
status in a specific area.
        
        I'm not 100% happy with this fix, because it's still untranslatable 
("waiting" is hardcoded).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.99.2.14&r2=1.99.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.17.2.11&r2=1.17.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.23&r2=1.15.2.24

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.14
retrieving revision 1.99.2.15
diff -u -b -r1.99.2.14 -r1.99.2.15
--- C4/Search.pm        3 Aug 2006 10:24:09 -0000       1.99.2.14
+++ C4/Search.pm        13 Sep 2006 16:34:28 -0000      1.99.2.15
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.14 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.15 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -1338,9 +1338,10 @@
                if ($datedue eq ''){
        #       $datedue="Available";
                        my 
($restype,$reserves)=C4::Reserves2::CheckReserves($data->{'itemnumber'});
-                       if ($restype) {
-                               $datedue=$restype;
-                       }
+            $data->{reservestatus} = $restype;
+#                      if ($restype) {
+#                              $datedue=$restype;
+#                      }
                }
                $isth->finish;
        #get branch information.....

Index: koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/Attic/detail.tmpl,v
retrieving revision 1.17.2.11
retrieving revision 1.17.2.12
diff -u -b -r1.17.2.11 -r1.17.2.12
--- koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl    18 May 2006 
19:14:10 -0000      1.17.2.11
+++ koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl    13 Sep 2006 
16:34:28 -0000      1.17.2.12
@@ -141,7 +141,7 @@
                                <td><!-- TMPL_VAR NAME="description" --></td>
                                <td><!-- TMPL_VAR NAME="branchname" --> <!-- 
TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- 
/TMPL_IF --></td>
                                <td>
-                                       <!-- TMPL_IF name="datedue" -->
+                                       <!-- TMPL_IF name="borrowernumber" -->
                                                On issue to <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
                                        <!-- TMPL_ELSE -->
                                                <!-- TMPL_IF 
name="notforloantext" -->
@@ -155,7 +155,8 @@
                                                <!-- /TMPL_IF -->
                                        <!-- /TMPL_IF -->
                                </td>
-                               <td><!-- TMPL_VAR NAME="datedue" --></td>
+                               <td><!-- TMPL_VAR NAME="datedue" -->
+                               <!-- TMPL_IF name="reservestatus" -->Reserve 
<!-- TMPL_VAR name="reservestatus" --><!-- /TMPL_IF --></td>
                                <td><!-- TMPL_VAR NAME="datelastseen" --></td>
                                <td><a 
href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- 
TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" 
-->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR 
NAME="barcode" --></a></td>
                                <td><!-- TMPL_VAR NAME="volumeddesc" --></td>

Index: koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.23
retrieving revision 1.15.2.24
diff -u -b -r1.15.2.23 -r1.15.2.24
--- koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl 2 Aug 2006 12:20:26 -0000       
1.15.2.23
+++ koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl 13 Sep 2006 16:34:28 -0000      
1.15.2.24
@@ -137,7 +137,7 @@
                                        <!-- /TMPL_IF -->
                                </td>
                                <td>
-                                       <!-- TMPL_IF name="datedue" -->
+                                       <!-- TMPL_IF name="borrowernumber" -->
                                                On loan
                                        <!-- TMPL_ELSE -->
                                                <!-- TMPL_IF 
name="notforloantext" -->
@@ -147,7 +147,8 @@
                                                <!-- /TMPL_IF -->
                                        <!-- /TMPL_IF -->
                                </td>
-                               <td><!-- TMPL_VAR NAME="datedue" --></td>
+                               <td><!-- TMPL_VAR NAME="datedue" -->
+                               <!-- TMPL_IF name="reservestatus" -->Reserve 
<!-- TMPL_VAR name="reservestatus" --><!-- /TMPL_IF --></td>
                                <td><!-- TMPL_VAR NAME="datelastseen" --></td>
                                <td><!-- TMPL_VAR NAME="barcode" --></td>
                        </tr>