Bugzilla – Attachment 70869 Details for
Bug 15326
Add CMS feature
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15326: [FOLLOW-UP] More fixes
Bug-15326-FOLLOW-UP-More-fixes.patch (text/plain), 2.69 KB, created by
Aleisha Amohia
on 2018-01-24 01:40:56 UTC
(
hide
)
Description:
Bug 15326: [FOLLOW-UP] More fixes
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2018-01-24 01:40:56 UTC
Size:
2.69 KB
patch
obsolete
>From 0c9230b6b8cf9b516f3a7bcf553da87a06daf9a7 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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 <xarragon@gmail.com> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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