[Bug 7220] New: Returns page message boxes being ignored
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Bug #: 7220 Summary: Returns page message boxes being ignored Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P5 - low Component: Circulation AssignedTo: kyle.m.hall@gmail.com ReportedBy: chrish@catalyst.net.nz QAContact: ian.walls@bywatersolutions.com CC: gmcharlt@gmail.com Created attachment 6301 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6301 patch to add additional ids to message dialog's in returns.tt that did not already have an id The message dialogs on the returns page are quite easy to miss as they are (by default) a rather dull colour. Attached is patch to add some further ids to the return page so that users can customise the display of the various messages (by adding a css entry in IntranetUserCSS) id : quick description rotating-collection : "this item is part of a rotating collection and needs to be..." return1 : "Please return ... to ..." return2 : "Please return ... to ..." hold-found1 : "hold found(item is already waiting)" hold-found2 : "hold found" transfer-needed : "Hold needing transfer found" item-transfer : "This item needs to be transferred to ..." example entry (add to IntranetUserCSS): div#return1 { background : blue; } -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Hall <chrish@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chrish@catalyst.net.nz -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 - low |PATCH-Sent Status|NEW |ASSIGNED Patch Status|--- |Failed QA AssignedTo|kyle.m.hall@gmail.com |chrish@catalyst.net.nz --- Comment #1 from Owen Leonard <oleonard@myacpl.org> 2011-11-14 13:40:31 UTC --- I get a conflict when I try to apply this patch, either by git bz apply or git am -i3u. Viewing the conflict, it looks like there's an error in the changes made by this patch: <<<<<<< HEAD [% END %] <div class="dialog message"> ======= [% END %] <div id="hold-found1" class="dialog message">
> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
This reverses the order of the [% END %] and the <div> which doesn't look correct. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #2 from Owen Leonard <oleonard@myacpl.org> 2011-11-14 13:46:17 UTC --- Sorry, my description of the problem is clearly wrong, so pay no attention to that. The conflicts are there, however: <<<<<<< HEAD [% IF ( soundon ) %] <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] <div class="dialog message"> ======= [% IF ( soundon ) %] <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] <div id="hold-found2" class="dialog message">
> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
-- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #3 from Chris Hall <chrish@catalyst.net.nz> 2011-11-14 19:56:19 UTC --- Hey Owen I did the patch against a different koha master to the koha community one (oops), so if there are any issues I can create a new patch. However, isn't that conflict just a change in whitespace? unless I am missing something (which is a very real possibility). <<<<<<< HEAD [% IF ( soundon ) %] <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] <div class="dialog message"> ======= [% IF ( soundon ) %] <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] <div id="hold-found2" class="dialog message">
> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
-- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #4 from Owen Leonard <oleonard@myacpl.org> 2011-11-14 20:27:52 UTC --- Would a patch conflict just because of whitespace? I don't know. But if the patch conflicts because it's not based on master then it should be resubmitted. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Hall <chrish@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6301|0 |1 is obsolete| | --- Comment #5 from Chris Hall <chrish@catalyst.net.nz> 2011-11-14 20:46:09 UTC --- Created attachment 6306 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6306 patch against koha community master to add ids to return message dialogs Yeah git will complain about a change in whitespace as it sees tabs and spaces as characters. Attached is patch against koha community master, hopefully this will make git happier :) -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #6 from Owen Leonard <oleonard@myacpl.org> 2011-11-15 13:49:40 UTC --- <<<<<<< HEAD [% IF ( soundon ) %] <audio src="/intranet-tmpl/prog/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] <div class="dialog message"> ======= <div id="transfer-needed" class="dialog message">
> made appropriate changes so that user can customise the display of messages on the returns page as per wr87151
Why does the patch remove the audio cues? -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz --- Comment #7 from Chris Cormack <chris@bigballofwax.co.nz> 2011-11-15 18:40:27 UTC --- If you look at the patch, it doesn't. http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6306 doesn't even touch that line That is a git conflict. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Failed QA |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Patch Status|Needs Signoff |Does not apply --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2011-12-21 06:37:59 UTC --- Not sure I get the problem from the comments above. Patch doesn't apply on master for me. Chris, can you perhaps fix and resubmit? Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: made appropriate changes so that user can customise the display of messages on the returns page as per wr87151 Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Failed to merge in the changes. Patch failed at 0001 made appropriate changes so that user can customise the display of messages on the returns page as per wr87151 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". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Hall <chrish@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6306|0 |1 is obsolete| | --- Comment #9 from Chris Hall <chrish@catalyst.net.nz> 2011-12-22 02:46:12 UTC --- Created attachment 6918 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6918 Patch corrected to apply against current master The patch should now apply against master, and contains the bug number in its commit message :) -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Does not apply |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Returns page message boxes |Add IDs to check-in message |being ignored |dialogs to facilitate CSS | |customization -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #10 from Owen Leonard <oleonard@myacpl.org> 2011-12-29 18:53:16 UTC --- Created attachment 6957 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6957 Signed-off patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Signed Off -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Ian Walls <ian.walls@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #6918|0 |1 is obsolete| | -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Ian Walls <ian.walls@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Passed QA --- Comment #11 from Ian Walls <ian.walls@bywatersolutions.com> 2012-01-05 13:30:35 UTC --- Template only change, just adding IDs. Easy to read, improves customizability. Marking Passed QA -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com Version|master |rel_3_6 Patch Status|Passed QA |Patch Pushed --- Comment #12 from Paul Poulain <paul.poulain@biblibre.com> 2012-01-06 14:54:18 UTC --- patch pushed, please test -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|PATCH-Sent (DO NOT USE) |P3 Status|Pushed to Master |Pushed to Stable -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 --- Comment #13 from Kyle M Hall <kyle.m.hall@gmail.com> --- Created attachment 8236 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=8236&action=edit Bug 7720 - Ambiguity in OPAC Details location - Followup - Add System Preference This commit adds the system preference OpacLocationBranchToDisplay which allows a library to control whether to display the holding library, the home library, or both for the opac details page. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7220 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #8236|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=7220 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Stable |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org