[Koha-bugs] [Bug 15326] Add CMS feature

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Fri Mar 22 07:44:24 CET 2019


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15326

Marcel de Rooy <m.de.rooy at rijksmuseum.nl> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #81 from Marcel de Rooy <m.de.rooy at rijksmuseum.nl> ---
Applying: Bug 15326: Add CMS feature
.git/rebase-apply/patch:191: tab in indent.
                    -asc => [qw/parent location branchcode lang sortorder/]
.git/rebase-apply/patch:241: tab in indent.
        my ( $self, $id ) = @_;
.git/rebase-apply/patch:243: tab in indent.
        carp( 'Missing CMS page id parameter in Koha::Pages::page' ) unless
defined $id;
.git/rebase-apply/patch:245: tab in indent.
        # Probably want to merge these to a single query:
.git/rebase-apply/patch:246: tab in indent.
        my $top_links = $self->_resultset()->search(
warning: squelched 77 whitespace errors
warning: 82 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       installer/data/mysql/kohastructure.sql
M       installer/data/mysql/userpermissions.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
M       opac/opac-main.pl
.git/rebase-apply/patch:191: tab in indent.
                    -asc => [qw/parent location branchcode lang sortorder/]
.git/rebase-apply/patch:241: tab in indent.
        my ( $self, $id ) = @_;
.git/rebase-apply/patch:243: tab in indent.
        carp( 'Missing CMS page id parameter in Koha::Pages::page' ) unless
defined $id;
.git/rebase-apply/patch:245: tab in indent.
        # Probably want to merge these to a single query:
.git/rebase-apply/patch:246: tab in indent.
        my $top_links = $self->_resultset()->search(
warning: squelched 77 whitespace errors
warning: 82 lines applied after fixing whitespace errors.

CONFLICT (content): Merge conflict in opac/opac-main.pl

CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc

Patch failed at 0001 Bug 15326: Add CMS feature

-- 
You are receiving this mail because:
You are watching all bug changes.


More information about the Koha-bugs mailing list