Continuing location fixes in modules. Adding permanent location in course-details.pl.
Created attachment 79618 [details] [review] Bug 21446: Correct perm location and enhance TO TEST: 1) Set ReturnToShelvingCart on. 2) Create a Course Reserve and make inactive. 3) Add an item, changing Item type, Collection code, Shelving location, and Holding library. 4) Note these four fields in the item list. 5) Activate course reserve. 6) Note subtle/no difference in these fiels in the list. 7) Check in the item. 8) Go back to course reserves and note that the cart is listed in the field instead of permanent location. 9) Deactivate course reserve. 10) Reset permanent location on item manually. 11) Apply patch. 12) Repeat steps 4-9 noting that the permanent location is showing instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold.
I've tracked the actual location change to course-details.tt. I also did some enhancements of the temporary changes and regular states so it is more obvious. I am also noting a couple flaws in the module: Notes can be changed by the course reserves, but should be appended to temporarily. The course reserves appears to permanently change the notes. Also, once an item is added to the reserve, editing the item will not produce any changes. You have to delete the item and add it again with the new changes for it to take. These items should be addressed in a new bug.
Scratch the comment about the notes. They seem to operate differently from the rest of the fields. This should be noted in the manual. Notes entered in course reserves do not replace notes in the item record as the other fields do. These notes only appear to show up in the course reserve modules.
Created attachment 79619 [details] [review] Bug 21446: Remove fix comment Fix is not needed.
Hi there Could you please rebase your patches as they are not applying cleanly on master. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21446: Correct perm location and enhance Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Failed to merge in the changes. Patch failed at 0001 Bug 21446: Correct perm location and enhance The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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-21446-Correct-perm-location-and-enhance-6FL5FL.patch Cheers, Alex
Created attachment 82104 [details] [review] Bug 21446: Remove fix comment Fix is not needed.
Created attachment 82105 [details] [review] Bug 21446: Correct perm location and enhance TO TEST: 1) Set ReturnToShelvingCart on. 2) Create a Course Reserve and make inactive. 3) Add an item, changing Item type, Collection code, Shelving location, and Holding library. 4) Note these four fields in the item list. 5) Activate course reserve. 6) Note subtle/no difference in these fiels in the list. 7) Check in the item. 8) Go back to course reserves and note that the cart is listed in the field instead of permanent location. 9) Deactivate course reserve. 10) Reset permanent location on item manually. 11) Apply patch. 12) Repeat steps 4-9 noting that the permanent location is showing instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold.
Created attachment 82106 [details] [review] Bug 21446: Remove fix comment Fix is not needed.
Rebased.
Created attachment 84113 [details] [review] Bug 21446: Remove fix comment Fix is not needed. Signed-off-by: helene hickey <hickeyhe@wgc.school.nz>
Created attachment 84675 [details] [review] Bug 21446: Improve display of changed values on course reserves and show permanent location instead of cart TO TEST: 1) Set ReturnToShelvingCart on. 2) Create a Course Reserve and make inactive. 3) Add an item, changing Item type, Collection code, Shelving location, and Holding library. 4) Note these four fields in the item list. 5) Activate course reserve. 6) Note subtle/no difference in these fiels in the list. 7) Check in the item. 8) Go back to course reserves and note that the cart is listed in the field instead of permanent location. 9) Deactivate course reserve. 10) Reset permanent location on item manually. 11) Apply patch. 12) Repeat steps 4-9 noting that the permanent location is showing instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 84676 [details] [review] Bug 21446: Remove fix comment Fix is not needed. Signed-off-by: helene hickey <hickeyhe@wgc.school.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Awesome work all! Pushed to master for 19.05
Cosmetic enhancement will not be backported to stable series.
I have noticed a typo that I think is related to this bug. In course reserves, when a course is inactive, the normal item type is lacking a closing parentheses in the item table. To Test: 1) Create a course in course reserves, make it inactive 2) Add an item to it, changing item type and location 3) Note that the normal item type is in bold with an opening parentheses but no closing parentheses; Note that the normal location is in bold with both opening and closing parentheses. 4) Make the course active 5) Note that the normal item type is no longer bold and has both opening and closing parentheses; Note that the normal location is also not bold and has both opening and closing parentheses. Please fix to add closing parentheses to the normal item type when a course is inactive. Thanks!
Opened bug 24283