X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=rotating_collections%2FeditCollections.pl;h=28a23e58675bd2a476a8142882bada58597b977b;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=aa46f44d06baaec55a4585422d7e920eb7a78ddf;hpb=d14a0cf5be3f6d31a9d5d23748285d077426c300;p=srvgit

diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
index aa46f44d06..28a23e5867 100755
--- a/rotating_collections/editCollections.pl
+++ b/rotating_collections/editCollections.pl
@@ -2,45 +2,46 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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, see <http://www.gnu.org/licenses>.
 #
 
 use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 
-use C4::Output;
-use C4::Auth;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
 
 use C4::RotatingCollections;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "rotating_collections/editCollections.tmpl",
+        template_name   => "rotating_collections/editCollections.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
-        debug           => 1,
     }
 );
 
+my $action = $query->param('action');
+$template->param( action => $action );
+
 # Create new Collection
-if ( $query->param('action') eq 'create' ) {
+if ( $action eq 'create' ) {
     my $title       = $query->param('title');
     my $description = $query->param('description');
 
@@ -62,7 +63,7 @@ if ( $query->param('action') eq 'create' ) {
 }
 
 ## Delete a club or service
-elsif ( $query->param('action') eq 'delete' ) {
+elsif ( $action eq 'delete' ) {
     my $colId = $query->param('colId');
     my ( $success, $errorCode, $errorMessage ) = DeleteCollection($colId);
 
@@ -77,9 +78,8 @@ elsif ( $query->param('action') eq 'delete' ) {
 }
 
 ## Edit a club or service: grab data, put in form.
-elsif ( $query->param('action') eq 'edit' ) {
-    my $colId = $query->param('colId');
-    my ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection($colId);
+elsif ( $action eq 'edit' ) {
+    my ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection( $query->param('colId') );
 
     $template->param(
         previousActionEdit => 1,
@@ -90,7 +90,7 @@ elsif ( $query->param('action') eq 'edit' ) {
 }
 
 # Update a Club or Service
-elsif ( $query->param('action') eq 'update' ) {
+elsif ( $action eq 'update' ) {
     my $colId       = $query->param('colId');
     my $title       = $query->param('title');
     my $description = $query->param('description');
@@ -112,15 +112,4 @@ elsif ( $query->param('action') eq 'update' ) {
     }
 }
 
-my $collections = GetCollections();
-
-$template->param(
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-
-    collectionsLoop => $collections,
-);
-
 output_html_with_http_headers $query, $cookie, $template->output;