Attachment 128356 Details for Bug 15326 – Bug 15326: (follow-up) WIP

[patch] Bug 15326: (follow-up) WIP

Bug-15326-follow-up-WIP.patch (text/plain), 19.39 KB, created by Aleisha Amohia on 2021-12-08 04:57:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2021-12-08 04:57:44 UTC

Size: 19.39 KB

patch

obsolete

>From 4247aa74b0cd07edd4714fadc356413b6cd7a2a5 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Tue, 7 Dec 2021 02:15:33 +1300
>Subject: [PATCH] Bug 15326: (follow-up) WIP
>
>Fixing breadcrumbs
>Hiding private/unpublished pages etc
>
>Still working on pages navigation
>---
> Koha/CmsPages.pm                                   |  9 +++
> .../mysql/atomicupdate/bug15326-add_cms_pages.pl   | 30 ++++++++
> .../mysql/atomicupdate/bug15326-add_cms_pages.sql  | 17 -----
> .../bug15326-add_cms_pages_permission.pl           | 12 ++++
> .../bug15326-add_cms_pages_permission.sql          |  1 -
> installer/data/mysql/kohastructure.sql             | 46 ++++++-------
> .../prog/en/includes/cms-pages-nav.inc             | 10 ++-
> .../prog/en/modules/tools/cmspages.tt              | 79 ++++++++++++++--------
> .../bootstrap/en/modules/opac-cmspages.tt          | 31 +++++----
> opac/opac-cmspages.pl                              | 23 ++++++-
> tools/cmspages.pl                                  |  4 +-
> 11 files changed, 173 insertions(+), 89 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug15326-add_cms_pages.pl
> delete mode 100644 installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql
> create mode 100644 installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.pl
> delete mode 100644 installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.sql
>
>diff --git a/Koha/CmsPages.pm b/Koha/CmsPages.pm
>index 663e75a499..edbc9987be 100644
>--- a/Koha/CmsPages.pm
>+++ b/Koha/CmsPages.pm
>@@ -131,6 +131,7 @@ sub list {
> 
>     my $page_list = [];
>     my $parent_list = [];
>+    my $navigation = [];
>     my %index;
>     my $data;
>     while ( my $page = $pages->next ) {
>@@ -163,8 +164,16 @@ sub list {
>         my $parent = { id => $old_id };
>         $parent->{'title_link'} = $index{ $old_id }->{'title_link'} unless not defined $old_id;
>         $page->{'parent'} = $parent;
>+    use Data::Dumper;
>+    warn Dumper($page->{title});
>+        if ( !$page->{parent} ) {
>+            push @{ $navigation }, $page;
>+        }
>     }
> 
>+    while ( scalar @{ $page_list } > 0 ) {
>+
>+
>     return ( $page_list, $parent_list, $data );
> }
> 
>diff --git a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.pl b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.pl
>new file mode 100644
>index 0000000000..3fa17165da
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.pl
>@@ -0,0 +1,30 @@
>+use Modern::Perl;
>+
>+{
>+    bug_number => "15326",
>+    description => "Add new table cms_pages",
>+    up => sub {
>+        my ($args) = @_;
>+        my ($dbh, $out) = @$args{qw(dbh out)};
>+
>+        unless( TableExists( 'cms_pages' ) ) {
>+            $dbh->do(q{ CREATE TABLE `cms_pages` (
>+              `id` int(6) NOT NULL AUTO_INCREMENT,
>+              `parent` int(6) DEFAULT NULL,
>+              `branchcode` varchar(10) DEFAULT NULL,
>+              `lang` varchar(25) NOT NULL DEFAULT '',
>+              `title` varchar(255) DEFAULT NULL,
>+              `title_link` varchar(64) DEFAULT NULL,
>+              `sortorder` int(3) NOT NULL DEFAULT 0,
>+              `location` tinyint(1) DEFAULT NULL,
>+              `publish` tinyint(1) NOT NULL DEFAULT 0,
>+              `content` text,
>+              PRIMARY KEY (`id`),
>+              INDEX `parent_index` (`parent`),
>+              INDEX `lang_index` (`lang`),
>+              INDEX `branchcode_index` (`branchcode`),
>+              CONSTRAINT `cmspages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
>+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci });
>+        }
>+    }
>+}
>diff --git a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql
>deleted file mode 100644
>index 9c051785fe..0000000000
>--- a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages.sql
>+++ /dev/null
>@@ -1,17 +0,0 @@
>- CREATE TABLE `cms_pages` (
>-  `id` int(6) NOT NULL AUTO_INCREMENT,
>-  `parent` int(6) DEFAULT NULL,
>-  `branchcode` varchar(10) DEFAULT NULL,
>-  `lang` varchar(25) NOT NULL DEFAULT '',
>-  `title` varchar(255) DEFAULT NULL,
>-  `title_link` varchar(64) DEFAULT NULL,
>-  `sortorder` int(3) NOT NULL DEFAULT 0,
>-  `location` tinyint(1) DEFAULT NULL,
>-  `publish` tinyint(1) NOT NULL DEFAULT 0,
>-  `content` text,
>-  PRIMARY KEY (`id`),
>-  INDEX `parent_index` (`parent`),
>-  INDEX `lang_index` (`lang`),
>-  INDEX `branchcode_index` (`branchcode`),
>-  CONSTRAINT `cmspages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
>-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
>diff --git a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.pl b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.pl
>new file mode 100644
>index 0000000000..664475e22b
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.pl
>@@ -0,0 +1,12 @@
>+use Modern::Perl;
>+
>+{
>+    bug_number => "15326",
>+    description => "Add new permission edit_pages",
>+    up => sub {
>+        my ($args) = @_;
>+        my ($dbh, $out) = @$args{qw(dbh out)};
>+
>+        $dbh->do(q{INSERT IGNORE INTO permissions (`module_bit`, `code`, `description`) VALUES ('13', 'edit_pages', 'Create, edit and delete CMS pages for OPAC and staff interfaces') });
>+    }
>+}
>diff --git a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.sql b/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.sql
>deleted file mode 100644
>index 72ce00f9a2..0000000000
>--- a/installer/data/mysql/atomicupdate/bug15326-add_cms_pages_permission.sql
>+++ /dev/null
>@@ -1 +0,0 @@
>-INSERT IGNORE INTO permissions (`module_bit`, `code`, `description`) VALUES ('13', 'edit_pages', 'Create, edit and delete CMS pages for OPAC and staff interfaces');
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 10d7d3577d..35b3070323 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1974,6 +1974,29 @@ CREATE TABLE `clubs` (
> /*!40101 SET character_set_client = @saved_cs_client */;
> 
> --
>+-- Table structure for table 'cms_pages', used for CMS functionality.
>+--
>+
>+DROP TABLE IF EXISTS `cms_pages`;
>+CREATE TABLE `cms_pages` (
>+  `id` int(6) NOT NULL AUTO_INCREMENT,
>+  `parent` int(6) DEFAULT NULL,
>+  `branchcode` varchar(10) DEFAULT NULL,
>+  `lang` varchar(25) NOT NULL DEFAULT '',
>+  `title` varchar(255) DEFAULT NULL,
>+  `title_link` varchar(64) DEFAULT NULL,
>+  `sortorder` int(3) NOT NULL DEFAULT 0,
>+  `location` tinyint(1) DEFAULT NULL,
>+  `publish` tinyint(1) NOT NULL DEFAULT 0,
>+  `content` text,
>+  PRIMARY KEY (`id`),
>+  INDEX `parent_index` (`parent`),
>+  INDEX `lang_index` (`lang`),
>+  INDEX `branchcode_index` (`branchcode`),
>+  CONSTRAINT `pages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
>+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
>+
>+--
> -- Table structure for table `collections`
> --
> 
>@@ -5357,29 +5380,6 @@ CREATE TABLE `zebraqueue` (
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
> /*!40101 SET character_set_client = @saved_cs_client */;
> 
>---
>--- Table structure for table 'cms_pages', used for CMS functionality.
>---
>-
>-DROP TABLE IF EXISTS `cms_pages`;
>- CREATE TABLE `cms_pages` (
>-  `id` int(6) NOT NULL AUTO_INCREMENT,
>-  `parent` int(6) DEFAULT NULL,
>-  `branchcode` varchar(10) DEFAULT NULL,
>-  `lang` varchar(25) NOT NULL DEFAULT '',
>-  `title` varchar(255) DEFAULT NULL,
>-  `title_link` varchar(64) DEFAULT NULL,
>-  `sortorder` int(3) NOT NULL DEFAULT 0,
>-  `location` tinyint(1) DEFAULT NULL,
>-  `publish` tinyint(1) NOT NULL DEFAULT 0,
>-  `content` text,
>-  PRIMARY KEY (`id`),
>-  INDEX `parent_index` (`parent`),
>-  INDEX `lang_index` (`lang`),
>-  INDEX `branchcode_index` (`branchcode`),
>-  CONSTRAINT `pages_branchcode_ibfk` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
>-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
>-
> /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
> 
> /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
>index c4787fdb5d..58e03a4491 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
>@@ -1,14 +1,18 @@
> [% IF pages %]
>     <ul id="cms_nav">
>+    [% FOREACH page IN pages %]
>+<li>[% page.title_link %]</li>
>+    [% END %]
>+    <hr>
>         [% FOREACH page IN pages %]
>             [% IF page.parentObj %]
>-                <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.parentObj.id | uri %]">[% page.parentObj.title | html %]</a></li>
>+                <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.parentObj.id | uri %]">[% page.parentObj.title_link | html %]</a></li>
>                 <ul>
>-                    <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.id | uri %]">[% page.title | html %]</a></li>
>+                    <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.id | uri %]">[% page.title_link | html %]</a></li>
>                 </ul>
>             [% ELSE %]
>                 [% UNLESS page.isaParent %]
>-                    <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.id | uri %]">[% page.title | html %]</a></li>
>+                    <li><a href="/cgi-bin/koha/tools/cmspages.pl?op=view&id=[% page.id | uri %]">[% page.title_link | html %]</a></li>
>                 [% END %]
>             [% END %]
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt
>index b55627bf18..b0e5bc4b21 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt
>@@ -2,50 +2,70 @@
> [% USE KohaDates %]
> [% USE Koha %]
> [% USE Asset %]
>+[% USE Branches %]
> [% SET footerjs = 1 %]
> [% SET link_opac_base = Koha.Preference( 'OPACBaseURL' ) %]
> [% SET link_opac = link_opac_base _ '/cgi-bin/koha/opac-cmspages.pl' %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>-    Koha &rsaquo; Tools &rsaquo; Pages
>     [% IF ( form ) %]
>         [% IF ( id ) %]
>-            &rsaquo; Edit page [% data.title | html %]
>+            Edit page [% data.title | html %] &rsaquo;
>         [% ELSE %]
>-            &rsaquo; Add page
>+            Add page &rsaquo;
>         [% END %]
>     [% ELSIF ( view ) %]
>         [% IF ( cms_page.parent ) %]
>              [% FOREACH parent IN parent_list %]
>-                &rsaquo; [% IF parent.id == cms_page.parent %][% parent.title_link | uri %][% END %]
>+                [% IF parent.id == cms_page.parent %][% parent.title_link | uri %] &rsaquo;[% END %]
>              [% END %]
>         [% END %]
>-        &rsaquo; [% cms_page.title_link | html %]
>+        [% cms_page.title_link | html %] &rsaquo;
>     [% END %]
>+    Pages &rsaquo; Tools &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="tools_koha-content" class="tools">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        [% IF ( form ) %]
>-            <a href="[% link_self | url %]">Pages</a> &rsaquo;
>-            [% IF ( id ) %]Edit page <em>[% data.title | html %]</em>[% ELSE %]Add page[% END %]
>-        [% ELSIF ( view ) %]
>-            <a href="[% link_self | url %]">Pages</a> &rsaquo;
>-            [% IF ( cms_page.parent ) %]
>-                 [% FOREACH parent IN parent_list %]
>-                     [% IF parent.id == cms_page.parent %]<a href="[% link_self | url %]?op=view&amp;id=[% cms_page.parent | uri %]">[% parent.title_link | uri %]</a> &rsaquo;[% END %]
>-                 [% END %]
>+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                [% IF form || view %]
>+                    <a href="/cgi-bin/koha/tools/cmspages.pl">Pages</a>
>+                [% ELSE %]
>+                    <a href="/cgi-bin/koha/tools/cmspages.pl" aria-current="page">Pages</a>
>+                [% END %]
>+            </li>
>+            [% IF ( form ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        [% IF ( id ) %]
>+                            Edit page <em>[% data.title | html %]</em>
>+                        [% ELSE %]
>+                            Add page
>+                        [% END %]
>+                    </a>
>+                </li>
>+            [% ELSIF ( view ) %]
>+                <li>
>+                [% IF ( cms_page.parent ) %]
>+                     [% FOREACH parent IN parent_list %]
>+                         [% IF parent.id == cms_page.parent %]<a href="[% link_self | url %]?op=view&amp;id=[% cms_page.parent | uri %]" aria-current="page">[% parent.title_link | uri %]</a>[% END %]
>+                     [% END %]
>+                [% END %]
>+                [% cms_page.title_link | html %]
>+                </li>
>             [% END %]
>-            [% cms_page.title_link | html %]
>-        [% ELSE %]
>-            Pages
>-        [% END %]
>-    </div>
>+        </ol>
>+    </nav>
> 
>     [% IF ( form ) %]
>         <div class="main container-fluid">
>@@ -58,13 +78,13 @@
>     [% END %]
>                 <main>
> 
>-                    [% UNLESS ( link_opac_base ) %]
>-                        <div class="dialog alert">
>-                            Warning: Preference <em>OPACBaseURL</em> not set. Some links might not work!
>-                        </div>
>-                    [% END %]
>-
>                     [% UNLESS ( form || view ) %]
>+                        [% UNLESS ( link_opac_base ) %]
>+                            <div class="dialog error">
>+                                System preference <strong class="error"><a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACBaseURL">OPACBaseURL</a></strong> not set. Some links might not work!
>+                            </div>
>+                        [% END %]
>+
>                         <div id="toolbar" class="btn-toolbar">
>                             <a class="btn btn-default" id="newentry" href="[% link_self | url %]?op=form"><i class="fa fa-plus"></i> New page</a>
>                         </div>
>@@ -84,6 +104,9 @@
>                         <div class="row">
>                             <div id="cms-page" class="col-sm-8">
>                                 <h1>Pages: [% cms_page.title | html %]</h1>
>+                                [% IF ( cms_page.branchcode && cms_page.branchcode != Branches.GetLoggedInBranchcode ) %]
>+                                    <div class="dialog message">This page is listed to display for [% Branches.GetName( cms_page.branchcode ) %] only.</div>
>+                                [% END %]
>                                 [% IF ( cms_page.publish == 1 ) %]
>                                     [% cms_page.content | $raw %]
>                                 [% ELSE %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-cmspages.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-cmspages.tt
>index 0e315e8c61..c6aa32e5e2 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-cmspages.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-cmspages.tt
>@@ -2,7 +2,7 @@
> [% USE Koha %]
> [% USE Branches %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online catalog[% END %][% IF (cms_page.title) %] &rsaquo; [% cms_page.title | html %][% END%]</title>
>+<title>[% IF (cms_page.title) %][% cms_page.title | html %] &rsaquo; [% END %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online catalog[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %][% END %]
> </head>
>@@ -10,20 +10,25 @@
> [% INCLUDE 'masthead.inc' %]
> 
> <div class="main">
>-    <ul class="breadcrumb">
>-        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
>-        [% IF ( cms_page.parent ) %]
>-            [% FOREACH parent IN parents %]
>-                [% IF parent.id == cms_page.parent %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/opac-cmspages.pl?id=[% cms_page.parent | uri %]">[% parent.title_link | html%]</a>
>-                        <span class="divider">&rsaquo;</span>
>-                    </li>
>+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
>+        <ol class="breadcrumb">
>+            <li class="breadcrumb-item active">
>+                <a href="#" aria-current="page">[% cms_page.title_link | html %]</a>
>+            </li>
>+            [% IF ( cms_page.parent ) %]
>+                [% FOREACH parent IN parents %]
>+                    [% IF parent.id == cms_page.parent %]
>+                        <li class="breadcrumb-item">
>+                            <a href="/cgi-bin/koha/opac-cmspages.pl?id=[% cms_page.parent | uri %]">[% parent.title_link | html%]</a>
>+                        </li>
>+                    [% END %]
>                 [% END %]
>             [% END %]
>-        [% END %]
>-        <li><a href="#">[% cms_page.title_link | html %]</a></li>
>-    </ul>
>+            <li class="breadcrumb-item">
>+                <a href="/cgi-bin/koha/opac-main.pl">Home</a>
>+            </li>
>+        </ol>
>+    </nav>
> 
>     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>         [% IF ( loggedinusername ) %]
>diff --git a/opac/opac-cmspages.pl b/opac/opac-cmspages.pl
>index ac31dae08d..5db352f612 100755
>--- a/opac/opac-cmspages.pl
>+++ b/opac/opac-cmspages.pl
>@@ -19,8 +19,8 @@
> 
> use Modern::Perl;
> use CGI qw( -utf8 );
>-use C4::Auth;
>-use C4::Output;
>+use C4::Auth qw( get_template_and_user );
>+use C4::Output qw( output_html_with_http_headers );
> use C4::Languages qw( getTranslatedLanguages accept_language );
> use Koha::CmsPages;
> use Data::Dumper;
>@@ -47,6 +47,25 @@ my ( $page_list, $parent_list, $page_data ) = Koha::CmsPages->list( $id );
> 
> my $links = Koha::CmsPages->search( { publish => 1 }, { order_by => 'sortorder' } );
> my $cms_data = Koha::CmsPages->find( $id );
>+if ( $cms_data->publish ) {
>+    # page has not been published
>+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
>+    exit;
>+}
>+
>+if ( $cms_data->location == 1 ) {
>+    # page for staff client only
>+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
>+    exit;
>+}
>+
>+my $patron = Koha::Patrons->find( $borrowernumber );
>+if ( $cms_data->branchcode and $cms_data->branchcode ne $patron->branchcode ) {
>+    # page not to display for this library
>+    print $input->redirect("/cgi-bin/koha/errors/404.pl");
>+    exit;
>+}
>+
> $template->param(
>     links       => $links,
>     cms_page    => $cms_data,
>diff --git a/tools/cmspages.pl b/tools/cmspages.pl
>index a8fd7421be..fbc28e0fcb 100755
>--- a/tools/cmspages.pl
>+++ b/tools/cmspages.pl
>@@ -20,8 +20,8 @@
> 
> use Modern::Perl;
> use CGI qw( -utf8 );
>-use C4::Auth;
>-use C4::Output;
>+use C4::Auth qw( get_template_and_user );
>+use C4::Output qw( output_html_with_http_headers );
> use C4::Languages qw( getTranslatedLanguages );
> use Koha::CmsPages;
> use Koha::Libraries;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 15326: 45621 | 58272 | 58607 | 58608 | 58609 | 58787 | 63904 | 63905 | 64241 | 64941 | 64942 | 66255 | 70866 | 70867 | 70868 | 70869 | 70870 | 70871 | 76387 | 76388 | 76389 | 76390 | 76391 | 76392 | 78232 | 78233 | 78234 | 78235 | 78236 | 78237 | 78238 | 78240 | 79269 | 83318 | 83319 | 83320 | 83321 | 83322 | 83323 | 83324 | 83325 | 83326 | 83404 | 83405 | 83406 | 83407 | 83408 | 83409 | 83410 | 83411 | 83412 | 84682 | 84683 | 84684 | 84685 | 84686 | 84687 | 84688 | 84689 | 84690 | 84691 | 87494 | 87495 | 87496 | 87497 | 87498 | 87499 | 87500 | 87501 | 87502 | 87503 | 87608 | 87609 | 87610 | 87617 | 96084 | 96085 | 96086 | 96087 | 96088 | 96089 | 96090 | 96091 | 96092 | 96093 | 96094 | 96095 | 96096 | 96097 | 96098 | 97237 | 101565 | 101566 | 101567 | 101568 | 101569 | 101570 | 101571 | 101572 | 101573 | 101574 | 101575 | 101576 | 101577 | 101578 | 101579 | 101580 | 128341 | 128342 | 128343 | 128344 | 128345 | 128346 | 128347 | 128348 | 128349 | 128350 | 128351 | 128352 | 128353 | 128354 | 128355 | 128356 | 128357 | 128585 | 128642 | 136432 | 136757 | 136768 | 138489 | 138493 | 139028 | 139029 | 139030 | 139031 | 139111 | 139123 | 139124 | 139125 | 139172 | 139173 | 139174