[Koha-bugs] [Bug 18026] URL to database columns link in system preferences is incorrect

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

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

dilan at calyx.net.au changed:

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

--- Comment #13 from dilan at calyx.net.au ---
I tried to apply the patch to ptfs sandbox 0 but received the following error
in an email during the sandbox setup:


The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 18026:
<h1>Something went wrong !</h1>Applying: Bug 18026 - URL to database columns
link in system preferences is incorrect (16.05.x)
Applying: Bug 18026 - URL to database columns link in system preferences is
incorrect (16.11.x)
Using index info to reconstruct a base tree...
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
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
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
Failed to merge in the changes.
Patch failed at 0001 Bug 18026 - URL to database columns link in system
preferences is incorrect (16.11.x)
The copy of the patch that failed is found in:
   /home/koha/src/.git/rebase-apply/patch

When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 18026 - URL to database columns link in system preferences is incorrect

60232 - Bug 18026 - URL to database columns link in system preferences is
incorrect (16.05.x)
60233 - Bug 18026 - URL to database columns link in system preferences is
incorrect (16.11.x)
60234 - Bug 18026 - URL to database columns link in system preferences is
incorrect (3.22.x)
60235 - Bug 18026 - URL to database columns link in system preferences is
incorrect (master)
60292 - Bug 18026 [ALTERNATIVE PATCH FOR MASTER] URL to database columns link
in system preferences is incorrect

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-18026---URL-to-database-columns-link-in-system-w0Wf3f.patch .

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