[Koha-bugs] [Bug 26831] Enable librarians to control when unaccepted private list share invites are removed by the cleanup_database.pl cronjob

[bugzilla-daemon at bugs.koha-community.org]

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Patch doesn't apply         |Needs Signoff

--- Comment #16 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
(In reply to David Nind from comment #12)
> The patches no longer apply 8-(..
> 
> git bz apply 26831
> 
> Bug 26831 - Enable librarians to control when unaccepted private list share
> invites are removed by the cleanup_database.pl cronjob
> 
> 140747 - Bug 26831: Add new system preference PurgeListShareInvitesOlderThan
> 140751 - Bug 26831: Use new PurgeListShareInvitesOlderThan syspref
> 140752 - Bug 26831: Attempting to clarify prioritising of options
> 
> Apply? [(y)es, (n)o, (i)nteractive] y
> Applying: Bug 26831: Add new system preference PurgeListShareInvitesOlderThan
> Using index info to reconstruct a base tree...
> M	installer/data/mysql/mandatory/sysprefs.sql
> M	koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
> Falling back to patching base and 3-way merge...
> Auto-merging
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
> CONFLICT (content): Merge conflict in
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
> Auto-merging installer/data/mysql/mandatory/sysprefs.sql
> error: Failed to merge in the changes.
> Patch failed at 0001 Bug 26831: Add new system preference
> PurgeListShareInvitesOlderThan

Hi David, 

Sorry for my delay, I've just back from a long holiday. I hope you are doing
well :)

I've rebased these patches against master. Ready to test again now.

Alex

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