In the OPAC, allow the patron to choose which branch they wish to make a purchase suggestion for. This should default to their home library. The option to show or hide this dropdown menu should be controllable by a system preference. Adding option to choose branch in purchase suggestion.
Created attachment 3392 [details] [review] patch
wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". nengard@debian:~/kohaclone$
Created attachment 3404 [details] [review] Patch
Signed off on first and submitted a follow up for sign off.
Created attachment 3405 [details] [review] follow up patch
Pushed, please test
This works, but opac-suggestions.pl shows the home branch in "suggested for" column instead of the suggestion branch.
Created attachment 3721 [details] [review] fix patch Fixed branch display
Fix patch is awaiting sign off
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3404 Attachement 3404: conflits -------------------------- Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref Using index info to reconstruct a base tree... <stdin>:26: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging admin/systempreferences.pl Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl 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/opac-tmpl/prog/en/modules/opac-suggestions.tmpl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl Failed to merge in the changes. Patch failed at 0001 Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
I've just merged master into my branch cleanly. Can you please try again, and if it's still making problems, I will reformat.
Thanks. Your "fix patch" replace "Patch" attachment? Message I see when I apply it: wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging admin/systempreferences.pl Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/en/mandatory/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl 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/opac-tmpl/prog/en/modules/opac-suggestions.tmpl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl Failed to merge in the changes. Patch failed at 0001 wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref
This bug is mentioned in: Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref http://lists.koha-community.org/pipermail/koha-patches/2011-March/014194.html Bug 5928 follow up remove branchcode label http://lists.koha-community.org/pipermail/koha-patches/2011-March/014195.html wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref http://lists.koha-community.org/pipermail/koha-patches/2011-March/014257.html Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref http://lists.koha-community.org/pipermail/koha-patches/2011-March/014193.html
Needs to be rebased onto master for Template::Toolkit
Created attachment 4705 [details] [review] patch Depends on bug 5917
I'm confused by this patch - the preference is already there, but this patch adds it again (I think) and also it doesn't look like it's Template Toolkit but the old templating system (I did not try to apply the patch).
Created attachment 4708 [details] [review] patch
Can you please include more of a description on the patch here? What does this do and how do I test it? Nicole
In the OPAC, allow the patron to choose which branch they wish to make a purchase suggestion for. This should default to their home library. The option to show or hide this dropdown menu should be controllable by a system preference. The preference is AllowPurchaseSuggestionBranchChoice
Okay, that's what I thought it did, but that preference already exists, so now I'm confused. Has this patch been pushed?
Looks to me like this has been pushed but I don't see any changes to the administrative side to make this information available to the staff.
(In reply to comment #21) > Looks to me like this has been pushed but I don't see any changes to the > administrative side to make this information available to the staff. Seems to be working fine now.