Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506

[koha.git] / opac / opac-serial-issues.pl

diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index 4aceed9..7b956f7 100755 (executable)
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -13,12 +13,14 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -41,13 +43,6 @@ my $sth;
 my ( $template, $loggedinuser, $cookie );
 my $biblionumber = $query->param('biblionumber');
 if ( $selectview eq "full" ) {
-    my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
-    my $subscriptioninformation=PrepareSerialsData($subscriptions);
-
-    my $title   = $subscriptions->[0]{bibliotitle};
-    my $yearmin = $subscriptions->[0]{year};
-    my $yearmax = $subscriptions->[ scalar(@$subscriptions) - 1 ]{year};
-
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "opac-full-serial-issues.tmpl",
@@ -57,6 +52,19 @@ if ( $selectview eq "full" ) {
             debug           => 1,
         }
     );
+    my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
+    my $subscriptioninformation=PrepareSerialsData($subscriptions);
+    # now, check is there is an alert subscription for one of the subscriptions
+    foreach (@$subscriptions) {
+        if (getalert($loggedinuser,'issue',$_->{subscriptionid})) {
+            $_->{hasalert} = 1;
+        }
+    }
+
+    my $title   = $subscriptions->[0]{bibliotitle};
+    my $yearmin = $subscriptions->[0]{year};
+    my $yearmax = $subscriptions->[ scalar(@$subscriptions) - 1 ]{year};
+
 
     # replace CR by <br> in librarian note
     # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
@@ -73,8 +81,6 @@ if ( $selectview eq "full" ) {
 
 }
 else {
-    my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
-
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "opac-serial-issues.tmpl",
@@ -85,6 +91,15 @@ else {
         }
     );
 
+    my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
+    # now, check is there is an alert subscription for one of the subscriptions
+    foreach (@$subscriptions) {
+        my $subscription = getalert($loggedinuser,'issue',$_->{subscriptionid});
+        if (@$subscription[0]) {
+            $_->{hasalert} = 1;
+        }
+    }
+
     # replace CR by <br> in librarian note
     # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;