http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 --- Comment #2 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- Looks like a good start, but I have a few comments: 1) The jQuery plugin and its associated assets need to go in koha-tmpl/opac-tmpl/lib/jquery/plugins. 2) Please provide the following in the commit message: the bug number at the beginning of the first line, a description (you can just copy what you put into Bugzilla), and a test plan. 3) All the database changes seem to be missing. You need to update sysprefs.sql as well as add an updatedatabase stanza to add the new sysprefs. 4) Once you have updated the patch, please change the status to "Needs signoff." -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 --- Comment #3 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 13474 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13474&action=edit Multibranch search and security -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Waylon Robertson <wrobertson1981@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13474|0 |1 is obsolete| | --- Comment #5 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 13475 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13475&action=edit Multibranch search and security Patch after rebase -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 --- Comment #7 from Waylon Robertson <wrobertson1981@gmail.com> --- (In reply to comment #6)

Waylon,

Just as a jump in comment I applied the patch and attempted to test and found that the way this patch is trying to solve the problem seems overly complex. Perhaps if we could consolidate the 3 sysprefs into 1 and add a more detailed testing plan?

More detailed testing plan, i agree with. One thing I have not learned is how to write a good testing plan. However, in regards to 3 vs 1 syspref's... I have to disagree. There are libraries that want the extra security, but don't need the multibranch search dropdown or the multiple branches on a patron, to be used in the search/branches filter, hence the three sysprefs. And, going to be adding a fourth, as a email on koha@ list has asked for the mod to also effect staff members searches. This too should be optional, at the choice of the library administrator. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=5806 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 cedric.vita@dracenie.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |cedric.vita@dracenie.com --- Comment #9 from cedric.vita@dracenie.com --- Something went wrong ! Applying: Multibranch search, patrons and security mod This mod creates the ability to search multiple branches using a jquery dropdown, instead of just one or all branches. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Auth.pm Auto-merging C4/Branch.pm Auto-merging C4/Koha.pm Auto-merging C4/Members/Attributes.pm Auto-merging installer/data/mysql/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 Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt Auto-merging opac/opac-search.pl CONFLICT (content): Merge conflict in opac/opac-search.pl Failed to merge in the changes. Patch failed at 0001 Multibranch search, patrons and security mod This mod creates the ability to search multiple branches using a jquery dropdown, instead of just one or all branches. 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". Bug 9055 - Mandumah.com's multiple branch search, multiple branch security mod Multibranch search and security Apply? [yn] Patch left in /tmp/Multibranch-search-and-security-i581g9.patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Waylon Robertson <wrobertson1981@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13475|0 |1 is obsolete| | --- Comment #10 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 21991 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=21991&action=edit Multibranch search/security patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 --- Comment #12 from Waylon Robertson <wrobertson1981@gmail.com> --- Brought the code up to the current master - 3.14 first alpha. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Waylon Robertson <wrobertson1981@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #21991|0 |1 is obsolete| | Attachment #21992|0 |1 is obsolete| | --- Comment #14 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 22742 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22742&action=edit Bug 9055 full patch to Nov 1st 2013 master Patch to resolve M. Thompsett's comments. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Waylon Robertson <wrobertson1981@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22742|0 |1 is obsolete| | --- Comment #15 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 23014 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23014&action=edit Bug 9055: Rebased for master as of 19th Nov 2013 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Waylon Robertson <wrobertson1981@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #23015|0 |1 is obsolete| | --- Comment #17 from Waylon Robertson <wrobertson1981@gmail.com> --- Created attachment 23016 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23016&action=edit Bug 9055: Rebased for master as of 19th Nov 2013 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22742|1 |0 is obsolete| | --- Comment #19 from M. Tompsett <mtompset@hotmail.com> --- Comment on attachment 22742 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22742 Bug 9055 full patch to Nov 1st 2013 master Unobsoleting the initial patch and fixing myself. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 --- Comment #20 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 23038 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23038&action=edit Bug 9055: Mandumah.com's multiple branch search, multiple branch security mod This mod creates the ability to search multiple branches using a jquery dropdown, instead of just one or all branches. This mod also replaces SearchMyLibraryFirst preference, giving three options: All = no change from standard koha setup. Preferhome = Prefers patron's home library (others may be searched), koha's current functionality of SearchMyLibraryFirst. Securehome = Only patrons' home library and other assigned libraries (if any) can be searched. With multiple instances of branchcode inside Borrower extended attributes, a patron can be given multiple branches to search within. The Securehome concept also includes the branch given in the apache enviroment of the host/virtualhost contacted, from OPAC_SEARCH_LIMIT = "branch: blah" This patch not only filters the GetBranches results, filtering the patrons ability to see other branches other than the ones given, it also filters the branches given in the limit branch: search options, so that even if a user manually inputted a branch, they are still only getting what they are ment to get. This enhancement would be useful for big libraries, in which its members would be restricted to searching and borrowing from a subset of its books. Overall, the multiple branch search dropdown should prove useful, even with unsecure installations. What is not included yet, is a method to decide what branches to show to a guest, not-logged-in, user. To use this patch, you need to create a branchcode Patron Extended Attribute, and have the patron your working with, have one or more branchcode extended attributes. So, total branches that patron will get: OPAC_SEARCH_LIMIT branch + Patron record home branch + whatever branchcodes you put into Borrower_attributes. You also need to set the preferences. The three new preferences to set are: - OPAC: SearchableBranches - Patrons: multibranch - Searching: MultiBranchSelect -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #23038|0 |1 is obsolete| | --- Comment #21 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 23250 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23250&action=edit Bug 9055: Mandumah.com's multiple branch search, multiple branch security mod This mod creates the ability to search multiple branches using a jquery dropdown, instead of just one or all branches. This mod also replaces SearchMyLibraryFirst preference, giving three options: All = no change from standard koha setup. Preferhome = Prefers patron's home library (others may be searched), koha's current functionality of SearchMyLibraryFirst. Securehome = Only patrons' home library and other assigned libraries (if any) can be searched. With multiple instances of branchcode inside Borrower extended attributes, a patron can be given multiple branches to search within. The Securehome concept also includes the branch given in the apache enviroment of the host/virtualhost contacted, from OPAC_SEARCH_LIMIT = "branch: blah" This patch not only filters the GetBranches results, filtering the patrons ability to see other branches other than the ones given, it also filters the branches given in the limit branch: search options, so that even if a user manually inputted a branch, they are still only getting what they are ment to get. This enhancement would be useful for big libraries, in which its members would be restricted to searching and borrowing from a subset of its books. Overall, the multiple branch search dropdown should prove useful, even with unsecure installations. What is not included yet, is a method to decide what branches to show to a guest, not-logged-in, user. To use this patch, you need to create a branchcode Patron Extended Attribute, and have the patron your working with, have one or more branchcode extended attributes. So, total branches that patron will get: OPAC_SEARCH_LIMIT branch + Patron record home branch + whatever branchcodes you put into Borrower_attributes. You also need to set the preferences. The three new preferences to set are: - OPAC: SearchableBranches - Patrons: multibranch - Searching: MultiBranchSelect -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #23251|0 |1 is obsolete| | --- Comment #23 from M. Tompsett <mtompset@hotmail.com> --- Created attachment 23252 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23252&action=edit Bug 9055: Mandumah.com's multiple branch search, multiple branch security mod This mod creates the ability to search multiple branches using a jquery dropdown, instead of just one or all branches. This mod also replaces SearchMyLibraryFirst preference, giving three options: All = no change from standard koha setup. Preferhome = Prefers patron's home library (others may be searched), koha's current functionality of SearchMyLibraryFirst. Securehome = Only patrons' home library and other assigned libraries (if any) can be searched. With multiple instances of branchcode inside Borrower extended attributes, a patron can be given multiple branches to search within. The Securehome concept also includes the branch given in the apache enviroment of the host/virtualhost contacted, from OPAC_SEARCH_LIMIT = "branch: blah" This patch not only filters the GetBranches results, filtering the patrons ability to see other branches other than the ones given, it also filters the branches given in the limit branch: search options, so that even if a user manually inputted a branch, they are still only getting what they are ment to get. This enhancement would be useful for big libraries, in which its members would be restricted to searching and borrowing from a subset of its books. Overall, the multiple branch search dropdown should prove useful, even with unsecure installations. What is not included yet, is a method to decide what branches to show to a guest, not-logged-in, user. To use this patch, you need to create a branchcode Patron Extended Attribute, and have the patron your working with, have one or more branchcode extended attributes. So, total branches that patron will get: OPAC_SEARCH_LIMIT branch + Patron record home branch + whatever branchcodes you put into Borrower_attributes. You also need to set the preferences. The three new preferences to set are: - OPAC: SearchableBranches - Patrons: multibranch - Searching: MultiBranchSelect -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 M. Tompsett <mtompset@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Failed QA -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9055 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com --- Comment #26 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- At over a year since the last comment, is anyone still using/working on this? -- You are receiving this mail because: You are watching all bug changes.