Description
Chris Cormack
2010-05-21 01:06:53 UTC
Created attachment 61861 [details] [review] Bug 3137: HideFieldsAddPatronForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and refresh page 2) Go to System preferences and confirm HideFieldsAddPatronForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. Sponsored-by: Catalyst IT Created attachment 61863 [details] [review] Bug 3137: HideFieldsAddPatronForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsAddPatronForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. Sponsored-by: Catalyst IT I like the idea. However: If I disable e.g. Alternate address and then, from a patron's detail page, follow the "Edit" link for Alternate address, I get an empty form, and I can not toggle the fields. I would expect that the fields display anyway (without toggling), since I explicitely clicked the "Edit" button for Alternate address. - I think it is the same for all partial edit forms. I have tested this quickly, but there is a display problem, where not all sections reappear. What I have done: - In the system preference, select all and save - In the patron add form, display all using the link - Notice some areas don't disappear/blue blocks are shown (see screenshot attached) I really like the idea of simplyfing the form a bit, but I would like to suggest to make use of the initial idea of collapsing/uncollapsing sections. Following scenario: I have a minimal patron add form with say, the second and third address hidden by default. While entering the data, I notice that I have to enter a second address. With this patch, I have to scroll back up, unlock all the hidden fields, scroll down and find the right ones. I think it would be nicer if the interface would always show the section headings (collapsing some according to the system preference) and then allow me to click on the heading to uncollapse/unfold the fields. That way I could keep entering data without the scrolling action. I hope that makes sense! Created attachment 62920 [details]
display problem when unhiding all
Created attachment 64094 [details] [review] Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections This patch removes the checkboxes from my previous patch and adds collapsing/uncollapsing sections. Follow the above test plan until step 6. The fields selected in HideFieldsAddPatronForm will still be hidden, but can now be shown and collapsed again (as well as all other sections) much more easily and without scrolling. Sponsored-by: Catalyst IT The patch don't apply during koha con17 The sandbox you've requested is not ready. Some problems occurred applying patches from bug 3137: <h1>Something went wrong !</h1>Applying: Bug 3137: HideFieldsAddPatronForm syspref Applying: Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections The copy of the patch that failed is found in: /home/sandbox1/src/.git/rebase-apply/patch When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 3137 - Add sys pref to collapse areas of the patron add by default 61863 - Bug 3137: HideFieldsAddPatronForm syspref 64094 - Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-3137-FOLLOW-UP-Remove-checkboxes-add-collapsin-FjL1Ir.patch . Created attachment 66590 [details] [review] [SIGNED-OFF] Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections This patch removes the checkboxes from my previous patch and adds collapsing/uncollapsing sections. Follow the above test plan until step 6. The fields selected in HideFieldsAddPatronForm will still be hidden, but can now be shown and collapsed again (as well as all other sections) much more easily and without scrolling. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 66591 [details] [review] [SIGNED-OFF] Bug 3137: HideFieldsAddPatronForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsAddPatronForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 66592 [details] [review] [SIGNED-OFF] Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections This patch removes the checkboxes from my previous patch and adds collapsing/uncollapsing sections. Follow the above test plan until step 6. The fields selected in HideFieldsAddPatronForm will still be hidden, but can now be shown and collapsed again (as well as all other sections) much more easily and without scrolling. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Applying: Bug 3137: [FOLLOW-UP] Remove checkboxes, add collapsing sections fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt). Repository lacks necessary blobs to fall back on 3-way merge. Created attachment 98623 [details] [review] Bug 3137: HideFieldsPatronAddForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. 8) Go back to the HideFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. Sponsored-by: Catalyst IT Created attachment 98626 [details] [review] Bug 3137: HideFieldsPatronAddForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. 8) Go back to the HideFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. 12) Confirm you can click the legend of each section to show and hide sections Sponsored-by: Catalyst IT Created attachment 98682 [details] [review] Bug 21156: (RM follow-up) Add missing filters Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Created attachment 98683 [details] [review] Bug 3137: HideFieldsPatronAddForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. 8) Go back to the HideFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. 12) Confirm you can click the legend of each section to show and hide sections Sponsored-by: Catalyst IT Signed-off-by: David Nind <david@davidnind.com> I've switched the sequence of patches when applying, but still get a conflict: Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 3137: HideFieldsPatronAddForm syspref Applying: Bug 21156: (RM follow-up) Add missing filters Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 21156: (RM follow-up) Add missing filters The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-21156-RM-follow-up-Add-missing-filters-BipPBa.patch Can you please rebase? (In reply to David Nind from comment #14) > Created attachment 98682 [details] [review] [review] > Bug 21156: (RM follow-up) Add missing filters > > Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> > > Signed-off-by: David Nind <david@davidnind.com> I think this was accidentally attached... the real patch applies cleanly. Apologies for that, signing off again (correctly this time!) Created attachment 99606 [details] [review] Bug 3137: HideFieldsPatronAddForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. 8) Go back to the HideFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. 12) Confirm you can click the legend of each section to show and hide sections Sponsored-by: Catalyst IT Signed-off-by: David Nind <david@davidnind.com> Ok, one blocker and 2 suggestions: Blocker: 1) The guarantor information won't collapse for me - can you please check? Suggestions: 2) I love the word 'collapse' for this behaviour. I want to suggest renaming the preference from HideFieldsPatronAddForm to CollapseFieldsPatronAddForm. I think using collapse would nicely set this off from other preferences like that actually hide things without giving the option to make them visible again. We could even think about naming it a little differently, perhaps: CollapseSectionsPatronAddForm. Not sure section is good, maybe areas? What I am htinking is that we don't really hide single fields, but 'parts' of the patron add form. 3) I'd remove the a. b. c. etc. from the pref. (In reply to Katrin Fischer from comment #20) > 3) I'd remove the a. b. c. etc. from the pref. I added the letters so that the options would be sorted by how they appear in the field, without the letters the options get sorted alphabetically. Happy to make this change though if the order of the options is fine to be alphabetical Created attachment 100503 [details] [review] Bug 3137: (follow-up) Rename using 'collapse', remove syspref lettering and fix guarantor section collapsing *** Bug 24758 has been marked as a duplicate of this bug. *** Created attachment 100598 [details] [review] Bug 3137: CollapseFieldsPatronAddForm system preference This patches adds a syspref - CollapseFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm CoolapseFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the system prefereence to hide them in the form 5) Go back to the add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the check box and confirm the hidden fields show or hide as expected. 8) Go back to the CollapseFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. 12) Confirm you can click the legend of each section to show and hide sections Sponsored-by: Catalyst IT Signed-off-by: David Nind <david@davidnind.com> Created attachment 100599 [details] [review] Bug 3137: (follow-up) Rename using 'collapse', remove syspref lettering and fix guarantor section collapsing Signed-off-by: David Nind <david@davidnind.com> Hi David, should the status here be Signed off? Thanks Katrin for spotting! It should have been, have changed now. Created attachment 100706 [details] [review] Bug 3137: HideFieldsPatronAddForm syspref This patches adds a syspref - HideFieldsAddPatronFrom - that controls which fieldsets are hidden by default in the add patron form. To test: 1) Apply patch and update database 2) Go to System preferences and confirm HideFieldsPatronAddForm has no fields selected 3) Go to add a patron / edit an existing patron (any patron category). confirm everything still works as expected. 4) Tick some of the fields in the syspref to hide them in the form 5) Go back to add patron form. 6) Confirm these fields are hidden and listed at the top of the page 7) Toggle the checkbox and confirm the hidden fields show or hide as expected. 8) Go back to the HideFieldsPatronAddForm system preference and ensure the Main address option is checked to be hidden 9) Go to the patron's details page 10) Click to edit the Contact Information section 11) Confirm the Main address option shows and the checkbox to show hidden fields is not present. 12) Confirm you can click the legend of each section to show and hide sections Sponsored-by: Catalyst IT Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 100707 [details] [review] Bug 3137: (follow-up) Rename using 'collapse', remove syspref lettering and fix guarantor section collapsing Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 100708 [details] [review] Bug 3137: (QA follow-up) Switch hidden for collapsed in text Changes the text and tooltip on top of the add/edit patron screen to use collapsed instead of hidden. Thx, Aleisha! Added a small follow-up, hope you agree. First and second patch could be squashed by RM, as both have same author/sign-offer. Nice work everyone! Pushed to master for 20.05 enhancement not backported to 19.11.x |