X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-detail.pl;h=0b6d35afa421808c0fb4c13f92b7b2cf4c1c31b8;hb=46a5154df940cf10e6718aa87717fdb87ebca702;hp=9e358a2305218506132b45daab0d8a2691d403b4;hpb=72d91ac3616437f30b1719b7bb95cdcc85802615;p=koha_gimpoz

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 9e358a2305..0b6d35afa4 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;
@@ -24,6 +24,7 @@ use C4::Dates qw/format_date/;
 use C4::Serials;
 use C4::Output;
 use C4::Context;
+use C4::Search qw/enabled_staff_search_views/;
 use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
 use Carp;
 
@@ -35,12 +36,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 ($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,
                 });
 
@@ -73,9 +94,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)
@@ -84,11 +102,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{$_}) if $_ && $$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};
 
@@ -101,6 +119,7 @@ if (! $subs->{dow}) {
 if (! $subs->{periodicity}) {
     $subs->{periodicity} = '0';
 }
+my $default_bib_view = get_default_view();
 $template->param(
 	subscriptionid => $subscriptionid,
     serialslist => \@serialslist,
@@ -118,6 +137,22 @@ $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';
+    }
+    return 'detail';
+}