@@ -, +, @@
---
Koha/CmsPage.pm | 31 ++++++++++++++++++++++
.../prog/en/includes/cms-pages-nav.inc | 16 +++++++++++
.../prog/en/modules/tools/cmspages.tt | 15 ++---------
.../prog/en/modules/tools/tools-home.tt | 3 +++
tools/cmspages.pl | 4 +--
tools/tools-home.pl | 6 ++++-
6 files changed, 59 insertions(+), 16 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
--- a/Koha/CmsPage.pm
+++ a/Koha/CmsPage.pm
@@ -22,6 +22,7 @@ use Modern::Perl;
use Carp;
use Koha::Database;
+use Koha::CmsPages;
use base qw( Koha::Object );
@@ -35,6 +36,36 @@ Koha::CmsPage - Koha Page Object class
=cut
+=head3 parentObj
+
+my $parent = $page->parentObj
+
+Return the parent page
+
+=cut
+
+sub parentObj {
+ my ( $self ) = @_;
+ my $p = $self->parent();
+ return scalar Koha::CmsPages->find( $p );
+}
+
+=head3 isParent
+
+Returns true if page is a parent
+
+=cut
+
+sub isaParent {
+ my ( $self ) = @_;
+ my @pages_with_this_parent = Koha::CmsPages->search({ parent => $self->id() });
+ if ( scalar @pages_with_this_parent > 0 ){
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
=head3 type
=cut
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cms-pages-nav.inc
@@ -0,0 +1,16 @@
+[% IF pages %]
+
- [% IF ( links ) %]
+ [% IF ( pages ) %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -107,6 +107,9 @@
[% IF ( CAN_user_tools_edit_pages ) %]
Pages
Create and edit additional content pages
+
+ [% INCLUDE 'cms-pages-nav.inc' %]
+
[% END %]
[% IF ( CAN_user_tools_schedule_tasks ) %]
--- a/tools/cmspages.pl
+++ a/tools/cmspages.pl
@@ -107,9 +107,9 @@ if ( $op eq 'form' ) {
print $cgi->redirect( $link_self );
} elsif ( $op eq 'view' ) {
my $cms_data = Koha::CmsPages->find( $id );
- my $links = Koha::CmsPages->search( {}, { order_by => 'sortorder' } );
+ my $pages = Koha::CmsPages->search({ location => [ 1, { '=', undef } ] }, { order_by => 'sortorder' });
$template->param(
- links => $links,
+ pages => $pages,
cms_page => $cms_data,
view => 1,
id => $id,
--- a/tools/tools-home.pl
+++ a/tools/tools-home.pl
@@ -22,6 +22,7 @@ use C4::Auth;
use C4::Output;
use C4::Tags qw/get_count_by_tag_status/;
use Koha::Reviews;
+use Koha::CmsPages;
my $query = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -38,9 +39,12 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my $pendingcomments = Koha::Reviews->search_limited({ approved => 0 })->count;
my $pendingtags = get_count_by_tag_status(0);
+my $pages = Koha::CmsPages->search({ location => [ 1, { '=', undef } ] }, { order_by => 'sortorder' });
+
$template->param(
pendingcomments => $pendingcomments,
- pendingtags => $pendingtags
+ pendingtags => $pendingtags,
+ pages => $pages,
);
output_html_with_http_headers $query, $cookie, $template->output;
--