X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serials%2Fsubscription-detail.pl;h=73868207225ade627915ea02f118bea49fcbd04c;hb=30dc7ed25b14775819320106d1c0479f990a6a8c;hp=4522677d86a24c1565c1d29f49b70c1e5d92e5ca;hpb=aaa8d0c80c893dbd92ced6c933263002cf6b048b;p=koha.git

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 4522677d86..7386820722 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -11,9 +11,9 @@
 # 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;
@@ -35,12 +35,32 @@ my ($template, $loggedinuser, $cookie, $hemisphere);
 my $subscriptionid = $query->param('subscriptionid');
 my $subs = GetSubscription($subscriptionid);
 
+$subs->{enddate} = GetExpirationDate($subscriptionid);
+
+if ($op && $op eq 'del') {
+	if ($subs->{'cannotedit'}){
+		carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+		print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+	}
+	DelSubscription($subscriptionid);
+	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
+	exit;
+}
+my ($routing, @routinglist) = getroutinglist($subscriptionid);
+my ($totalissues,@serialslist) = GetSerials($subscriptionid);
+$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
+# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
+
+# Permission needed if it is a deletion (del) : delete_subscription
+# Permission needed otherwise : *
+my $permission = ($op eq "del") ? "delete_subscription" : "*";
+
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-detail.tmpl",
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {serials => 1},
+                flagsrequired => {serials => $permission},
                 debug => 1,
                 });
 
@@ -56,10 +76,12 @@ if ($op eq 'del') {
     # Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues
     my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);
     my $linkedissues = CountIssues($subscriptionid);
-    if ($strictlyexpired == 0 || $linkedissues > 0) {
+    my $countitems   = HasItems($subscriptionid);
+    if ($strictlyexpired == 0 || $linkedissues > 0 || $countitems>0) {
 		$template->param(NEEDSCONFIRMATION => 1);
 		if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
 		if ($linkedissues     > 0) { $template->param("LINKEDISSUES" => 1); }
+		if ($countitems       > 0) { $template->param("LINKEDITEMS"  => 1); }
     } else {
 		$issueconfirmed = "1";
     }
@@ -71,9 +93,6 @@ if ($op eq 'del') {
     }
 }
 my $hasRouting = check_routing($subscriptionid);
-my ($totalissues,@serialslist) = GetSerials($subscriptionid);
-$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
-# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
 my ($user, $sessionID, $flags);
 ($user, $cookie, $sessionID, $flags)
@@ -82,11 +101,11 @@ my ($user, $sessionID, $flags);
 # COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
 
 for my $date qw(startdate enddate firstacquidate histstartdate histenddate){
-	$$subs{$_}      = format_date($$subs{$_});
+    $$subs{$date}      = format_date($$subs{$date}) if $date && $$subs{$date};
 }
+$subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
 $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
-
-$template->param($subs);
+$template->param(%{ $subs });
 $template->param(biblionumber_for_new_subscription => $subs->{bibnum});
 my @irregular_issues = split /,/, $subs->{irregularity};
 
@@ -99,6 +118,7 @@ if (! $subs->{dow}) {
 if (! $subs->{periodicity}) {
     $subs->{periodicity} = '0';
 }
+my $default_bib_view = get_default_view();
 $template->param(
 	subscriptionid => $subscriptionid,
     serialslist => \@serialslist,
@@ -116,6 +136,21 @@ $template->param(
     intranetstylesheet => C4::Context->preference('intranetstylesheet'),
     intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
     irregular_issues => scalar @irregular_issues,
+    default_bib_view => $default_bib_view,
     );
 
 output_html_with_http_headers $query, $cookie, $template->output;
+
+sub get_default_view {
+    my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
+    my $views = { C4::Search::enabled_staff_search_views };
+    if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
+        return 'ISBDdetail';
+    } elsif  ($defaultview eq 'marc' && $views->{can_view_MARC}) {
+        return 'MARCdetail';
+    } elsif  ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) {
+        return 'labeledMARCdetail';
+    } else {
+        return 'detail';
+    }
+}