[Bug 7825] New: Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force"
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Priority: P5 - low Change sponsored?: --- Bug ID: 7825 Assignee: oleonard@myacpl.org Summary: Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force" QA Contact: koha.sekjal@gmail.com Severity: enhancement Classification: Unclassified OS: All Reporter: srdjan@catalyst.net.nz Hardware: All Status: NEW Version: master Component: OPAC Product: Koha Work to be done: * Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force" * opac-reserve.pl: change if (OPACItemHolds) logic to if (OPACItemHolds eq "yes") * opac-reserve.tt: - change OPACItemHolds tests to take in account new values as appropriate - if OPACItemHolds is "force" do not display "Place On" column, and automatically open "Select a specific copy" table How to test: * Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) * Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) * Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Assignee|oleonard@myacpl.org |srdjan@catalyst.net.nz --- Comment #1 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 8641 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8641&action=edit patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |stephane.delaye@biblibre.co | |m --- Comment #2 from delaye <stephane.delaye@biblibre.com> --- i test the option force with this sys pref and it's work. It's a request of customers i sign the patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #3 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 8645 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8645&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8641|0 |1 is obsolete| | --- Comment #4 from delaye <stephane.delaye@biblibre.com> --- Created attachment 8646 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8646&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|yes|force choice -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 delaye <stephane.delaye@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8645|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |paul.poulain@biblibre.com --- Comment #5 from Paul Poulain <paul.poulain@biblibre.com> --- My tests show 2 problems: * when you set the syspref to "allow", the user should be able to choose "next available" or any item. I can't have the item list appearing ! * when you set the syspref to "force", it seems good, as you get the items list and no option to say "next available". BUT, you can submit the form without choosing any item, and in this case, it seems that you've placed a "next available" hold. The 3rd option (don't allow) is OK Overall, it may be easy to fix, but for now it does not work. PS: anyone who tests and want to switch back to master = DELETE from systempreferences WHERE variable="OPACItemHolds"; INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); will revert you to "without 7825 applied" If you just switch to master branch, things go crazy because the syspref is no more 0/1 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |7854 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 claire.hernandez@biblibre.com <claire.hernandez@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |claire.hernandez@biblibre.c | |om -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #6 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 12881 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12881&action=edit Bug 7825: Followup prevent submission without choosing an item -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff CC| |jonathan.druart@biblibre.co | |m --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #5)
My tests show 2 problems: * when you set the syspref to "allow", the user should be able to choose "next available" or any item. I can't have the item list appearing !
I can't reproduce, "it works for me"
* when you set the syspref to "force", it seems good, as you get the items list and no option to say "next available". BUT, you can submit the form without choosing any item, and in this case, it seems that you've placed a "next available" hold.
I think my patch solves this problem. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #8 from delaye <stephane.delaye@biblibre.com> --- i want test in a sandbox (biblibre) but i have the message 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/opac-tmpl/prog/en/modules/opac-reserve.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8646|0 |1 is obsolete| | Attachment #12881|0 |1 is obsolete| | --- Comment #9 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 12883 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12883&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #10 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 12884 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12884&action=edit Bug 7825: Followup prevent submission without choosing an item -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #11 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 12885 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12885&action=edit Bug 7825: Followup values are 1, 0 or 'force' -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #12 from delaye <stephane.delaye@biblibre.com> --- if the force mode is active in 'OPACItemHolds' there must be one item is selected by default in this screen ../cgi-bin/koha/opac-reserve.pl?biblionumbers=... and in the table 'Select a specific copy' -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #13 from Paul Poulain <paul.poulain@biblibre.com> --- (In reply to comment #12)
if the force mode is active in 'OPACItemHolds' there must be one item is selected by default in this screen
../cgi-bin/koha/opac-reserve.pl?biblionumbers=...
and in the table 'Select a specific copy'
I add my word to what stephane says, because he just showed me the problem: if you set the value to "force" and validate your hold without selecting an item, the hold is placed ... 1st available, which should be forbidden by the "Force" syspref. The easiest solution to this problem is to select the 1st item in the list of items (that will avoid one click to all holds placed on records with just one item !) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #14 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- No disrespect, I understand the motivation, but I deliberately created 7854 in order to be able to avoid 0, 1, force. I could have done it that way myself, but it is wrong and perpetuates a deficiency in the config system -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #15 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #14)
No disrespect, I understand the motivation, but I deliberately created 7854 in order to be able to avoid 0, 1, force. I could have done it that way myself, but it is wrong and perpetuates a deficiency in the config system
Hi Srdjan! The values 'yes' and 'no' can't be choosen for systempreferences. When you change the value of OPACItemHolds using the interface (preferences.pl), only 'force' is keep. 'yes' and 'no' are respectively replaced with 1 and ''. So you can't use the comparaison with 'yes' in the template. This behaviour is due to the YAML::Syck::ImplicitTyping flag set to on (see http://search.cpan.org/~toddr/YAML-Syck-1.21/lib/YAML/Syck.pm#$YAML::Syck::I...). The simpliest way is to change 'yes' and 'no' with 'allow' and 'noallow' for example. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #16 from Jonathan Druart <jonathan.druart@biblibre.com> --- Ho ok, it's what you explain in the Bug 7854 :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12885|0 |1 is obsolete| | --- Comment #17 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12915 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12915&action=edit Bug 7825: Followup - Change choices to avoid conflicts with system preference implicit typeing. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com --- Comment #18 from Kyle M Hall <kyle@bywatersolutions.com> ---
The simpliest way is to change 'yes' and 'no' with 'allow' and 'noallow' for example.
I completely agree. Trying to override the implicit typing just to use 'yes' and 'no' seems a bit silly and overly complicated. I've written a followup to do just that ( coincidentally, I used 'allow' and 'noallow' without knowing you had suggested the same thing! ). Jonathan, I hope it's ok that I've obsoleted your one patch, as this patch is essentially a replacement for that one. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12883|0 |1 is obsolete| | --- Comment #19 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12920 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12920&action=edit [SIGNED-OFF] Bug 7825 - Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force" Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12884|0 |1 is obsolete| | --- Comment #20 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12921 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12921&action=edit [SIGNED-OFF] Bug 7825: Followup prevent submission without choosing an item Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12915|0 |1 is obsolete| | --- Comment #21 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12922 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12922&action=edit Bug 7825: Followup - Change choices to avoid conflicts with system preference implicit typeing. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12922|0 |1 is obsolete| | --- Comment #22 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 12923 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=12923&action=edit Bug 7825: Followup - Change choices to avoid conflicts with system preference implicit typing. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|7854 | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|srdjan@catalyst.net.nz |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz --- Comment #23 from Chris Cormack <chris@bigballofwax.co.nz> --- (In reply to comment #18)
The simpliest way is to change 'yes' and 'no' with 'allow' and 'noallow' for example.
I completely agree. Trying to override the implicit typing just to use 'yes' and 'no' seems a bit silly and overly complicated.
I've written a followup to do just that ( coincidentally, I used 'allow' and 'noallow' without knowing you had suggested the same thing! ).
Jonathan, I hope it's ok that I've obsoleted your one patch, as this patch is essentially a replacement for that one.
I disagree, implicit typing is wrong, and the real fix is what Srdjan outlined on bug 7854. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |In Discussion --- Comment #24 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #23)
I disagree, implicit typing is wrong, and the real fix is what Srdjan outlined on bug 7854.
Hi Chris! I agree with you, implicit typing is not what we want. But the Bug 7854 is open for 6 months and no one proposed a patch. So we have 3 (more?) solutions: 1/ Block this patch and wait for a patch for Bug 7854 (and maybe have side effect, we don't know). 2/ Keep ImplicitTyping for YesNo and remove it for others types. 3/ Considering that a YesNo admits a boolean value rather than a Choice type, it is not logical to have Yes, No and a third value (Yes and No should cover 100% of choices, but here we have a third choice) I think the option 2 is not persuasive. It requires a new layer to parse YAML. For me it sounds good to have not Yes, No and a third choice. And this patch could be in master before Bug 7854. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Needs Signoff --- Comment #25 from Jonathan Druart <jonathan.druart@biblibre.com> --- No answer and no discussion, so I switch back to Needs SO. Feedback welcomed :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #12920|0 |1 is obsolete| | Attachment #12921|0 |1 is obsolete| | Attachment #12923|0 |1 is obsolete| | --- Comment #26 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13305 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13305&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #27 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13306 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13306&action=edit Bug 7825: Followup prevent submission without choosing an item -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #28 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13307 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13307&action=edit Bug 7825: Followup values are 1, 0 or 'force' -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #29 from Jonathan Druart <jonathan.druart@biblibre.com> --- rebased patches -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #30 from delaye <stephane.delaye@biblibre.com> --- if in the system preference OPACItemHolds the option "force" is selected when the borrower make a hold the first item in the table "select a specific copy" must be checked by default. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #31 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13340 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13340&action=edit FIX some ergonomic issues in opac-reserve -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #32 from Jonathan Druart <jonathan.druart@biblibre.com> --- The last patch fixes some ergonomic issues: - Preselect an item (force and allow option) - Add a toggle function in order to show or hide the items block -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13340|0 |1 is obsolete| | --- Comment #33 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13341 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13341&action=edit Bug 7825: FIX some ergonomic issues in opac-reserve -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #34 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #35 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 13350 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13350&action=edit Bug 7825: FIX some ergonomic issues in opac-reserve http://bugs.koha-community.org/show_bug.cgi?id=7825 Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=5786 --- Comment #36 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I think this new setting will have to be incorporated in bug 5786 - depending on what gets pushed first. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13341|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #37 from Jonathan Druart <jonathan.druart@biblibre.com> --- Rebasing this patch is really a pain. It is signed off and the Bug 5786 is blocked in discussion. So I think we don't have to wait for it. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #38 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 5786 has been on and off the -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #39 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Bug 5786 has been around since 2011 - it hurts me to see that this important development is stuck in discussion. But I was not trying to say that this has to wait, only pointing out a conflict that will arise at some point that needs to be addressed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl Patch complexity|--- |Medium patch QA Contact|koha.sekjal@gmail.com |m.de.rooy@rijksmuseum.nl --- Comment #40 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Problem with third patch: Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #41 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #40)
Problem with third patch:
Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Hi Marcel, I cannot reproduce: $ git reset --hard origin/master $ git bz apply 7825 Bug 7825 - Change OPACItemHolds syspref to be of type Choice, choices being "no", "yes", "force" bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Apply? [yn] y Applying: bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Bug 7825: Followup prevent submission without choosing an item Apply? [yn] y Applying: Bug 7825: Followup prevent submission without choosing an item Bug 7825: Followup values are 1, 0 or 'force' Apply? [yn] y Applying: Bug 7825: Followup values are 1, 0 or 'force' Bug 7825: FIX some ergonomic issues in opac-reserve Apply? [yn] y Applying: Bug 7825: FIX some ergonomic issues in opac-reserve -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #42 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Sorry, Jonathan. I retried on current master, with git bz now: Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7825: Followup values are 1, 0 or 'force' Does not apply -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13305|0 |1 is obsolete| | --- Comment #43 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15032 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15032&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13306|0 |1 is obsolete| | --- Comment #44 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15033 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15033&action=edit Bug 7825: Followup prevent submission without choosing an item -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13307|0 |1 is obsolete| | --- Comment #45 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15034 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15034&action=edit Bug 7825: Followup values are 1, 0 or 'force' -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13350|0 |1 is obsolete| | --- Comment #46 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15035 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15035&action=edit Bug 7825: FIX some ergonomic issues in opac-reserve http://bugs.koha-community.org/show_bug.cgi?id=7825 Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #47 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #42)
Sorry, Jonathan. I retried on current master, with git bz now:
Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7825: Followup values are 1, 0 or 'force'
Does not apply
Marcel, I just rebased these patchs because of I got a conflict on the updatedatabase.pl file. But I didn't get your error. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #48 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Applying: Bug 7825: Followup values are 1, 0 or 'force' /usr/share/koha/testclone/.git/rebase-apply/patch:32: tab in indent. [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %] fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7825: Followup values are 1, 0 or 'force' Could you please check on a fresh/clean git? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #15032|0 |1 is obsolete| | Attachment #15033|0 |1 is obsolete| | Attachment #15034|0 |1 is obsolete| | Attachment #15035|0 |1 is obsolete| | --- Comment #49 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15606 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15606&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #50 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 15607 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=15607&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #51 from Jonathan Druart <jonathan.druart@biblibre.com> --- Marcel, Same on a fresh install. I rebased the 3 last patches. I hope it will be better like that. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #52 from Jonathan Druart <jonathan.druart@biblibre.com> --- s/rebased/rebased and squashed -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #15606|0 |1 is obsolete| | Attachment #15607|0 |1 is obsolete| | --- Comment #53 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18435 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18435&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #54 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18436 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18436&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #55 from Jonathan Druart <jonathan.druart@biblibre.com> --- Rebased patches... -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #56 from Chris Cormack <chris@bigballofwax.co.nz> --- I can't QA this as its a Catalyst patch, can someone else please look at it -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #57 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #56)
I can't QA this as its a Catalyst patch, can someone else please look at it
And I proposed a patch + SO from BibLibre, I cannot either. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #58 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to comment #57)
(In reply to comment #56)
I can't QA this as its a Catalyst patch, can someone else please look at it
And I proposed a patch + SO from BibLibre, I cannot either.
Luckily, we have more people on the QA team :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #59 from Kyle M Hall <kyle@bywatersolutions.com> --- CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18435|0 |1 is obsolete| | Attachment #18436|0 |1 is obsolete| | --- Comment #60 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18878 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18878&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #61 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18879 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18879&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #62 from Kyle M Hall <kyle@bywatersolutions.com> --- It looks like there is a value conflict here. The database update is assuming the syspref value of '1' should be converted to 'yes', but the code is still assuming it that it is '1'. I think leaving 'no' as an empty value makes the template code cleaner, but I think it would be better to keep the alteration of '1' to 'yes'. However, it's probably much easier to alter the database update, so I wouldn't fail qa just for keeping '1' instead of 'yes'. I hope this makes sense! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #63 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #62)
It looks like there is a value conflict here. The database update is assuming the syspref value of '1' should be converted to 'yes', but the code is still assuming it that it is '1'.
I think leaving 'no' as an empty value makes the template code cleaner, but I think it would be better to keep the alteration of '1' to 'yes'. However, it's probably much easier to alter the database update, so I wouldn't fail qa just for keeping '1' instead of 'yes'.
I hope this makes sense!
Hum... whaou, not easy to understand :) In fact "yes" and "no" are "transformed" to 1 and "" (see comment 15 and bug 7854). So if we want to have 1 and 0 in DB, we will got "1", "0" and "force" which is not really cleaner I think. We cannot set "yes", "no" and "force" in the DB and to test strings ("yes", "no", "force") in the template. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #64 from Kyle M Hall <kyle@bywatersolutions.com> --- Thanks for the clarity! I should have remembered that! Kyle (In reply to comment #63)
(In reply to comment #62)
It looks like there is a value conflict here. The database update is assuming the syspref value of '1' should be converted to 'yes', but the code is still assuming it that it is '1'.
I think leaving 'no' as an empty value makes the template code cleaner, but I think it would be better to keep the alteration of '1' to 'yes'. However, it's probably much easier to alter the database update, so I wouldn't fail qa just for keeping '1' instead of 'yes'.
I hope this makes sense!
Hum... whaou, not easy to understand :) In fact "yes" and "no" are "transformed" to 1 and "" (see comment 15 and bug 7854). So if we want to have 1 and 0 in DB, we will got "1", "0" and "force" which is not really cleaner I think. We cannot set "yes", "no" and "force" in the DB and to test strings ("yes", "no", "force") in the template.
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18878|0 |1 is obsolete| | --- Comment #65 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18903 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18903&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18879|0 |1 is obsolete| | --- Comment #66 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18904 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18904&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18879|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18878|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18903|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18904|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #67 from Kyle M Hall <kyle@bywatersolutions.com> --- I was a bit premature passing QA ( sorry! ). Passes qa tests. The commit messages are basically non-existent so I would suggest someone fix up the commit messages. The big issue is still the database values for this are '1', '0' ( actually empty string, but no need to split hairs ), and 'force', but the database update is still modifying them to be 'yes' or 'no'. I think the simple solution would be to remove the database update, which is superfluous, and breaks the functionality. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #68 from Kyle M Hall <kyle@bywatersolutions.com> --- Actually, I'm wrong, the database updated is needed to change it to a 'choice' with the choice values, but the actual preference value should not be updated.
I think the simple solution would be to remove the database update, which is superfluous, and breaks the functionality.
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #69 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #68)
Actually, I'm wrong, the database updated is needed to change it to a 'choice' with the choice values, but the actual preference value should not be updated.
I think the simple solution would be to remove the database update, which is superfluous, and breaks the functionality.
Yes! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #70 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 18920 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18920&action=edit Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #71 from Jonathan Druart <jonathan.druart@biblibre.com> --- Switch back to NSO but maybe it is not necessary to retest of the feature just for the DB change. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #72 from Kyle M Hall <kyle@bywatersolutions.com> --- The db change does not alter the behavior of the patch set, so I don't believe it needs to be signed off separately. It's more of a qa followup. (In reply to comment #71)
Switch back to NSO but maybe it is not necessary to retest of the feature just for the DB change.
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18878|0 |1 is obsolete| | Attachment #18879|0 |1 is obsolete| | Attachment #18920|0 |1 is obsolete| | --- Comment #73 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18924 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18924&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18924|0 |1 is obsolete| | --- Comment #74 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18925 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18925&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18925|0 |1 is obsolete| | --- Comment #75 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18926 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18926&action=edit bug_7825: Sign off Changed OPACItemHolds syspref to be no|tes|force choice Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #76 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18927 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18927&action=edit Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #77 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18928 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18928&action=edit Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #78 from Kyle M Hall <kyle@bywatersolutions.com> --- Everything looks good, though we still have a lack of a decent commit message. Perhaps this will do: Currently, the Koha system preference OPACItemHolds allows a library system to choose to allow patrons to place bib and item level holds from the OPAC, or to allow patrons only to place bib level holds only from the opac. This patch set adds a third option, "force", which *requires* that patrons place item level holds from the opac, with no option of making a bib level hold. This patch modifies the system preference OPACItemHolds to be of the type "Choice", with the choices being "no", "yes", "force". The patch does not alter the currently set value of OPACItemHolds for database updates, only adding the additional option. Test Plan: 1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) 2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) 3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_14_candidate -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |gmcharlt@gmail.com --- Comment #79 from Galen Charlton <gmcharlt@gmail.com> --- Patch no longer applies; merge conflict is not straightforward to resolve. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18926|0 |1 is obsolete| | Attachment #18927|0 |1 is obsolete| | Attachment #18928|0 |1 is obsolete| | --- Comment #80 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22635 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22635&action=edit Bug 7825: Changed OPACItemHolds syspref to be no|tes|force choice Currently, the Koha system preference OPACItemHolds allows a library system to choose to allow patrons to place bib and item level holds from the OPAC, or to allow patrons only to place bib level holds only from the opac. This patch set adds a third option, "force", which *requires* that patrons place item level holds from the opac, with no option of making a bib level hold. This patch modifies the system preference OPACItemHolds to be of the type "Choice", with the choices being "no", "yes", "force". The patch does not alter the currently set value of OPACItemHolds for database updates, only adding the additional option. Test Plan: 1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) 2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) 3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful This patch is a squashed patch of the 3 following patches: Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. Original patch is from Srdjan Jankovic. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #81 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Galen Charlton from comment #79)
Patch no longer applies; merge conflict is not straightforward to resolve.
Not easy to rebase, bug 10836 changed a big part of the html stucture. Switch back to Needs Signoff :-( I squashed all 3 patches, I did not manage to rebase them cleanly. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |sandboxes@biblibre.com --- Comment #82 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Patch tested with a sandbox, by Koha team AMU <koha.aixmarseille@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22635|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #83 from sandboxes@biblibre.com <sandboxes@biblibre.com> --- Created attachment 22877 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22877&action=edit Bug 7825: Changed OPACItemHolds syspref to be no|tes|force choice Currently, the Koha system preference OPACItemHolds allows a library system to choose to allow patrons to place bib and item level holds from the OPAC, or to allow patrons only to place bib level holds only from the opac. This patch set adds a third option, "force", which *requires* that patrons place item level holds from the opac, with no option of making a bib level hold. This patch modifies the system preference OPACItemHolds to be of the type "Choice", with the choices being "no", "yes", "force". The patch does not alter the currently set value of OPACItemHolds for database updates, only adding the additional option. Test Plan: 1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) 2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) 3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful This patch is a squashed patch of the 3 following patches: Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. Original patch is from Srdjan Jankovic. Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|kyle@bywatersolutions.com |jonathan.druart@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #84 from Kyle M Hall <kyle@bywatersolutions.com> --- Works for ccsr and prog, but not bootstrap. One other comment: when forcing item holds, it would probably be best to display the list of items be default so the patron knows which specific copy has been selected for the hold. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #85 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm, may be a misunderstanding - I think forcing the holds means that you can't place a bib level hold, but only an item level hold? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #86 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 23631 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=23631&action=edit Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap Same test plan as previous patch but with the bootstrap theme set. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #87 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Kyle M Hall from comment #84)
One other comment: when forcing item holds, it would probably be best to display the list of items be default so the patron knows which specific copy has been selected for the hold.
I would prefer not to modify the tt file since it is signed off. I don't think it could be considered as blocker. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #88 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Comment on attachment 22877 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22877 Bug 7825: Changed OPACItemHolds syspref to be no|tes|force choice Review of attachment 22877: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=7825&attachment=22877) ----------------------------------------------------------------- Hi Jonathan, in your comment you wrote: The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. But I still see the yes/no in the database update and syspref part? ::: installer/data/mysql/sysprefs.sql @@ +228,4 @@
('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','Textarea'), ('OpacHighlightedWords','1','','If Set, then queried words are higlighted in OPAC','YesNo'), ('OpacHoldNotes','0','','Show hold notes on OPAC','YesNo'), +('OPACItemHolds','yes','no|yes|force','Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy.','Choice'),
Should be 0 and 1? ::: installer/data/mysql/updatedatabase.pl @@ +7745,5 @@
+ +$DBversion = "3.13.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("UPDATE systempreferences SET type = 'Choice', options = 'no|yes|force' WHERE variable = 'OPACItemHolds'");
Should be 0 and 1? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #89 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I will wait for a follow-up and then continue on this as soon as I can. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #90 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24218 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24218&action=edit Bug 7825: Clarify the yes and no values The value of the pref should be '1' (for yes) or '0' (for no). The options could be kept as 'yes' and 'no': since the ImplicitTyping is set, yes/no would become '1/0'. But I think it is preferable not to use the yes/no value in order not to introduce a bug here if ImplicitTyping is unset later. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|m.de.rooy@rijksmuseum.nl |katrin.fischer@bsz-bw.de --- Comment #91 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Thx Jonathan, back to testing this. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #92 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, I fixed the database update to be 15 and include the bug number, but now I am stuck: I can't get force to behave as described in the bootstrap theme. It behaves like 'no', not allowing me to set item level holds. I have checked in the database the value for the pref is really set to 'force' and have tried reloading the Javascript. Jonathan, can you please check and also include the other 2 changes if another patch is needed? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #93 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #92)
Hi Jonathan, I fixed the database update to be 15 and include the bug number, but now I am stuck: I can't get force to behave as described in the bootstrap theme. It behaves like 'no', not allowing me to set item level holds. I have checked in the database the value for the pref is really set to 'force' and have tried reloading the Javascript.
Katrin, I am very sorry! I was sure to test all cases but it seems I missed something. Given that it is a specific case and the code is different from the prog theme, I am sure I have tested it! Anyway, it could not work with this code... I will provide a followup.
Jonathan, can you please check and also include the other 2 changes if another patch is needed?
Yes. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24218|0 |1 is obsolete| | --- Comment #94 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24270 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24270&action=edit Bug 7825: Clarify the yes and no values The value of the pref should be '1' (for yes) or '0' (for no). The options could be kept as 'yes' and 'no': since the ImplicitTyping is set, yes/no would become '1/0'. But I think it is preferable not to use the yes/no value in order not to introduce a bug here if ImplicitTyping is unset later. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #95 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24271 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24271&action=edit Bug 7825: FIX the force value for the bootstrap theme If the pref was set to 'force', the item selection was not shown. .copiesrow should be hidden before showing specific #copiesrow_ID -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22877|0 |1 is obsolete| | Attachment #23631|0 |1 is obsolete| | Attachment #24270|0 |1 is obsolete| | Attachment #24271|0 |1 is obsolete| | --- Comment #96 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24538 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24538&action=edit [PASSED QA] Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice Currently, the Koha system preference OPACItemHolds allows a library system to choose to allow patrons to place bib and item level holds from the OPAC, or to allow patrons only to place bib level holds only from the opac. This patch set adds a third option, "force", which *requires* that patrons place item level holds from the opac, with no option of making a bib level hold. This patch modifies the system preference OPACItemHolds to be of the type "Choice", with the choices being "no", "yes", "force". The patch does not alter the currently set value of OPACItemHolds for database updates, only adding the additional option. Test Plan: 1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) 2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) 3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful This patch is a squashed patch of the 3 following patches: Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. Original patch is from Srdjan Jankovic. Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Testing notes on 4th patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #97 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24539 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24539&action=edit [PASSED QA] Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap Same test plan as previous patch but with the bootstrap theme set. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #98 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24540 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24540&action=edit [PASSED QA] Bug 7825: Clarify the yes and no values The value of the pref should be '1' (for yes) or '0' (for no). The options could be kept as 'yes' and 'no': since the ImplicitTyping is set, yes/no would become '1/0'. But I think it is preferable not to use the yes/no value in order not to introduce a bug here if ImplicitTyping is unset later. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #99 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24541 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24541&action=edit [PASSED QA] Bug 7825: FIX the force value for the bootstrap theme If the pref was set to 'force', the item selection was not shown. .copiesrow should be hidden before showing specific #copiesrow_ID Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Works on template level, tested with Boostrap and Prog theme with all 3 possible seetings of OPACItemHolds: 1) no = offer only title level holds 2) yes = offer both title and item level holds 3) force = offer only item level holds Also ran some additional tests on the Boostrap theme with deactivated Javascript. Note: I like this, but I think when "force" is selected the item list needs to be shown by default. I am also not so happy that the first item is automatically selected, but this is the current behaviour without the patches as well. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24541|0 |1 is obsolete| | --- Comment #100 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24542 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24542&action=edit [PASSED QA] Bug 7825: FIX the force value for the bootstrap theme If the pref was set to 'force', the item selection was not shown. .copiesrow should be hidden before showing specific #copiesrow_ID Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Works on template level, tested with Boostrap and Prog theme with all 3 possible seetings of OPACItemHolds: 1) no = offer only title level holds 2) yes = offer both title and item level holds 3) force = offer only item level holds Also ran some additional tests on the Boostrap theme with deactivated Javascript. Note: I like this, but I think when "force" is selected the item list needs to be shown by default. I am also not happy about preselecting the first item. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #101 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I was close to passing this, as you can see from the attached patches, but I am not happy about the force behaviour. I think Kyle already pointed it out in comment 84: When force is selected, the item list is not shown by default. Additionally the first item is preselected. Both points bother me. The user will have no idea which item, which itemtype (short loan? normal loan?) at which branch got selected for the hold to fill. I think this is kind of missing the point of forcing the patron to pick the item to fill the hold. For serials, where it really matters which item you pick, this is even more difficult. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #102 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24578 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24578&action=edit Bug 7825: QA followup - preselection of items This patch changes the default behavior for the 'force' value. If the pref is set to force, no item is preselected and the item list is shown. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #103 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 24579 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24579&action=edit Bug 7825: QA followup - preselection of items (bootstrap) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #104 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Katrin Fischer from comment #101) Hi Katrin, The 2 last patches fix your request. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24578|0 |1 is obsolete| | Attachment #24579|0 |1 is obsolete| | --- Comment #105 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24591 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24591&action=edit [PASSED QA] Bug 7825: QA followup - preselection of items This patch changes the default behavior for the 'force' value. If the pref is set to force, no item is preselected and the item list is shown. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #106 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 24592 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=24592&action=edit [PASSED QA] Bug 7825: QA followup - preselection of items (bootstrap) Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Retested with all 3 themes, works as expected. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #107 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Jonathan, thx for taking my suggestions into account. It works as described. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_16_candidate -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_3_14_candidate, | |rel_3_16_candidate | Status|Passed QA |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #24538|0 |1 is obsolete| | Attachment #24539|0 |1 is obsolete| | Attachment #24540|0 |1 is obsolete| | Attachment #24542|0 |1 is obsolete| | Attachment #24591|0 |1 is obsolete| | Attachment #24592|0 |1 is obsolete| | --- Comment #108 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27961 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27961&action=edit Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice Currently, the Koha system preference OPACItemHolds allows a library system to choose to allow patrons to place bib and item level holds from the OPAC, or to allow patrons only to place bib level holds only from the opac. This patch set adds a third option, "force", which *requires* that patrons place item level holds from the opac, with no option of making a bib level hold. This patch modifies the system preference OPACItemHolds to be of the type "Choice", with the choices being "no", "yes", "force". The patch does not alter the currently set value of OPACItemHolds for database updates, only adding the additional option. Test Plan: 1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now (no "Place On" column, no "Select a specific copy" table, making a reserve is successful) 2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now ( "Place On" column is there, "Select a specific copy" table shows when "A specific copy" is selected, making a reserve is successful) 3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows: - no "Place On" column is present - "Select a specific copy" table is opened - making a reserve is successful This patch is a squashed patch of the 3 following patches: Amended opac-reserve.tt accordingly Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Followup prevent submission without choosing an item + Fix some ergonomic issues in opac-reserve Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com> Bug 7825: Updatedatabase should only change the type and options values. The value field should not be change. We have to keep '1' for 'yes' and '' for 'no'. Original patch is from Srdjan Jankovic. Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Testing notes on 4th patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #109 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27962 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27962&action=edit Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap Same test plan as previous patch but with the bootstrap theme set. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #110 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27963 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27963&action=edit Bug 7825: Clarify the yes and no values The value of the pref should be '1' (for yes) or '0' (for no). The options could be kept as 'yes' and 'no': since the ImplicitTyping is set, yes/no would become '1/0'. But I think it is preferable not to use the yes/no value in order not to introduce a bug here if ImplicitTyping is unset later. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #111 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27964 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27964&action=edit Bug 7825: FIX the force value for the bootstrap theme If the pref was set to 'force', the item selection was not shown. .copiesrow should be hidden before showing specific #copiesrow_ID Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Works on template level, tested with Boostrap and Prog theme with all 3 possible seetings of OPACItemHolds: 1) no = offer only title level holds 2) yes = offer both title and item level holds 3) force = offer only item level holds Also ran some additional tests on the Boostrap theme with deactivated Javascript. Note: I like this, but I think when "force" is selected the item list needs to be shown by default. I am also not happy about preselecting the first item. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #112 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27965 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27965&action=edit Bug 7825: QA followup - preselection of items This patch changes the default behavior for the 'force' value. If the pref is set to force, no item is preselected and the item list is shown. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 --- Comment #113 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 27966 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=27966&action=edit Bug 7825: QA followup - preselection of items (bootstrap) Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Retested with all 3 themes, works as expected. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA --- Comment #114 from Jonathan Druart <jonathan.druart@biblibre.com> --- Last patch set fix conflicts with bug 11648. Back to Passed QA. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #115 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master. Thanks, Srdjan and Jonathan! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=13478 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Heather Braum <hbraum@nekls.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |hbraum@nekls.org -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 jdemuth@roseville.ca.us <jdemuth@roseville.ca.us> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jdemuth@roseville.ca.us -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7825 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to Master |CLOSED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org