From 0c9230b6b8cf9b516f3a7bcf553da87a06daf9a7 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 10 Jul 2017 01:28:53 +0000 Subject: [PATCH] Bug 15326: [FOLLOW-UP] More fixes This patch removes the t/Pages.t file because it isn't required, and other unused methods. This patch is ready to test. The appropriate tests are in t/db_dependent/Pages.t --- Koha/CmsPages.pm | 31 ------------------------------- t/Pages.t | 31 ------------------------------- tools/cmspages.pl | 2 +- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 t/Pages.t diff --git a/Koha/CmsPages.pm b/Koha/CmsPages.pm index a5ed1ea..fb0ef92 100644 --- a/Koha/CmsPages.pm +++ b/Koha/CmsPages.pm @@ -164,37 +164,6 @@ sub list { return ( $page_list, $parent_list, $data ); } -=head3 page - -Retrieves all data to show a single CMS page. - -=cut - -sub page { - my ( $self, $id ) = @_; - - carp( 'Missing CMS page id parameter in Koha::Pages::page' ) unless defined $id; - - my $page_data = $self->_resultset()->find( $id ); - - return $page_data; -} - -=head3 child_links - -Lists pages which are children of a specific id (or undef for root). - -=cut - -sub child_links { - my ( $self, $id ) = @_; - - # 'id' can be undefined if listing top-level links. - my $rs = $self->_resultset()->search({ parent => $id }, { qw/id title_link/ }); - - return $rs; -} - =head1 AUTHOR Martin Persson diff --git a/t/Pages.t b/t/Pages.t deleted file mode 100644 index 5e6d463..0000000 --- a/t/Pages.t +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/perl - -use Modern::Perl; -use Carp; -use Test::More tests => 2; -use Data::Dumper::Concise; - -BEGIN { - use_ok('C4::Content'); -} - -my $src = [ - { id => '1', parent => '' }, - { id => '2', parent => '1' }, - { id => '3', parent => '1' }, - { id => '4', parent => '2' }, - { id => '5', parent => '2' }, -]; - -my $expected = [ - { id => '1', children => [ - { id => '2', children => [ - { id => '4', children => [] }, - { id => '5', children => [] } ] - }, - { id => '3', children => [] } ] - }, -]; - -my $output = C4::Content::_SQLToPerl($src); -is_deeply($output, $expected); diff --git a/tools/cmspages.pl b/tools/cmspages.pl index ccacc3a..0f7258b 100755 --- a/tools/cmspages.pl +++ b/tools/cmspages.pl @@ -102,7 +102,7 @@ if ( $op eq 'form' ) { } print $cgi->redirect( $link_self ); } elsif ( $op eq 'view' ) { - my $cms_data = Koha::CmsPages->page( $id ); + my $cms_data = Koha::CmsPages->find( $id ); my $links = Koha::CmsPages->search( {}, { order_by => 'sortorder' } ); $template->param( links => $links, -- 2.1.4