Bug 5928 - Allow selection of "purchase for" library in Purchase Suggestions
Summary: Allow selection of "purchase for" library in Purchase Suggestions
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: OPAC (show other bugs)
Version: 3.4
Hardware: All All
: PATCH-Sent (DO NOT USE) enhancement (vote)
Assignee: Srdjan Jankovic
QA Contact: Bugs List
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-03-22 01:06 UTC by Shelley
Modified: 2023-01-16 14:58 UTC (History)
5 users (show)

See Also:
Change sponsored?: Sponsored
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
patch (7.17 KB, patch)
2011-03-22 04:16 UTC, Srdjan Jankovic
Details | Diff | Splinter Review
Patch (7.02 KB, patch)
2011-03-22 21:09 UTC, Chris Cormack
Details | Diff | Splinter Review
follow up patch (1.59 KB, patch)
2011-03-22 21:19 UTC, Nicole C. Engard
Details | Diff | Splinter Review
fix patch (7.17 KB, patch)
2011-04-06 05:22 UTC, Srdjan Jankovic
Details | Diff | Splinter Review
patch (7.17 KB, patch)
2011-07-22 01:00 UTC, Srdjan Jankovic
Details | Diff | Splinter Review
patch (2.29 KB, patch)
2011-07-22 04:11 UTC, Srdjan Jankovic
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Shelley 2011-03-22 01:06:32 UTC
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.
Comment 1 Srdjan Jankovic 2011-03-22 04:16:12 UTC Comment hidden (obsolete)
Comment 2 Nicole C. Engard 2011-03-22 21:00:58 UTC
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$
Comment 3 Chris Cormack 2011-03-22 21:09:36 UTC
Created attachment 3404 [details] [review]
Patch
Comment 4 Nicole C. Engard 2011-03-22 21:18:35 UTC
Signed off on first and submitted a follow up for sign off.
Comment 5 Nicole C. Engard 2011-03-22 21:19:23 UTC
Created attachment 3405 [details] [review]
follow up patch
Comment 6 Chris Cormack 2011-03-22 21:51:29 UTC
Pushed, please test
Comment 7 Julian Maurice 2011-04-05 12:27:33 UTC
This works, but opac-suggestions.pl shows the home branch in "suggested for" column instead of the suggestion branch.
Comment 8 Srdjan Jankovic 2011-04-06 05:22:22 UTC Comment hidden (obsolete)
Comment 9 Chris Cormack 2011-04-06 07:21:28 UTC
Fix patch is awaiting sign off
Comment 10 claire.hernandez@biblibre.com 2011-04-07 08:14:50 UTC
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
Comment 11 Srdjan Jankovic 2011-04-08 03:51:12 UTC
I've just merged master into my branch cleanly. Can you please try again, and if it's still making problems, I will reformat.
Comment 12 claire.hernandez@biblibre.com 2011-04-08 07:53:24 UTC
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
Comment 13 MJ Ray (software.coop) 2011-04-09 09:25:23 UTC
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
Comment 14 Chris Cormack 2011-07-08 00:02:03 UTC
Needs to be rebased onto master for Template::Toolkit
Comment 15 Srdjan Jankovic 2011-07-22 01:00:51 UTC Comment hidden (obsolete)
Comment 16 Nicole C. Engard 2011-07-22 01:15:24 UTC
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).
Comment 17 Srdjan Jankovic 2011-07-22 04:11:15 UTC
Created attachment 4708 [details] [review]
patch
Comment 18 Nicole C. Engard 2011-07-22 16:56:36 UTC
Can you please include more of a description on the patch here? What does this do and how do I test it?

Nicole
Comment 19 Srdjan Jankovic 2011-07-25 23:05:48 UTC
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
Comment 20 Nicole C. Engard 2011-08-01 13:33:40 UTC
Okay, that's what I thought it did, but that preference already exists, so now I'm confused. Has this patch been pushed?
Comment 21 Owen Leonard 2011-08-12 15:37:54 UTC
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.
Comment 22 Owen Leonard 2012-11-22 00:01:45 UTC
(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.