[Koha-bugs] [Bug 30279] Log when personal data is displayed in staff client

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |severine.queune at bulac.fr

--- Comment #8 from Séverine Queune <severine.queune at bulac.fr> ---
Hi David,
I get this error message trying to apply the patch on a devbox :

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 30279: Log viewing of personal data in staff client
Using index info to reconstruct a base tree...
M       installer/data/mysql/mandatory/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30279: Log viewing of personal data in staff client
hint: Use 'git am --show-current-patch=diff' to see the failed 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".
Patch left in
/tmp/Bug-30279-Log-viewing-of-personal-data-in-staff-cl-iw9yB4.patch

I'll be happy to test it when it's fixed !
Séverine

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