Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / cataloguing / editor.pl

diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl
index 6d0fd0d..7fb34cf 100755 (executable)
--- a/cataloguing/editor.pl
+++ b/cataloguing/editor.pl
@@ -4,21 +4,21 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 '2009';
+use Modern::Perl;
 
 use CGI;
 use MARC::Record;
@@ -29,6 +29,9 @@ use C4::Context;
 use C4::Output;
 use DBIx::Class::ResultClass::HashRefInflator;
 use Koha::Database;
+use Koha::MarcSubfieldStructures;
+use Koha::BiblioFrameworks;
+use Koha::KeyboardShortcuts;
 
 my $input = CGI->new;
 
@@ -38,12 +41,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 'edit_catalogue' },
+        flagsrequired   => {
+            editcatalogue => {
+                'edit_catalogue'  => 1,
+                'advanced_editor' => 1
+            },
+        }
     }
 );
 
 my $schema = Koha::Database->new->schema;
 
+my @keyboard_shortcuts = Koha::KeyboardShortcuts->search();
+
+# Keyboard shortcuts
+$template->param(
+    shortcuts => \@keyboard_shortcuts,
+);
+
 # Available import batches
 $template->{VARS}->{editable_batches} = [ $schema->resultset('ImportBatch')->search(
     {
@@ -56,6 +71,12 @@ $template->{VARS}->{editable_batches} = [ $schema->resultset('ImportBatch')->sea
 # Needed information for cataloging plugins
 $template->{VARS}->{DefaultLanguageField008} = pack( 'A3', C4::Context->preference('DefaultLanguageField008') || 'eng' );
 
+my $authtags = Koha::MarcSubfieldStructures->search({ authtypecode => { '!=' => '' }, 'frameworkcode' => '' });
+$template->{VARS}->{authtags} = $authtags;
+
+my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
+$template->{VARS}->{frameworks} = $frameworks;
+
 # Z39.50 servers
 my $dbh = C4::Context->dbh;
 $template->{VARS}->{z3950_servers} = $dbh->selectall_arrayref( q{