SIP does not currently send the zipcode in the address field, I think it should.
Created attachment 9647 [details] [review] Bug 8125 - Adds zipcode to address output Please test thoroughly - also, I don't know if there is a specific field that SIP expects zipcode to be in. If there is, this patch probably won't fix the issue. To test: fetch a valid patron using SIP. The Address field should have the zipcode included.
The zip code is just part of the address in sip terms, but the patch as is does not do that it appends address to adr but it never appends zip you probably want two lines and make the second test on $adr && $zip the test (is there a string of greater than 0 length in both elsements?) is there to decide whether to add a space before appending the new element. I think $adr .= ($adr && $address ) ? " $address" : $address; $adr .= ($adr && $zip) ? " $zip" : $zip; is what you want.
Created attachment 9694 [details] [review] Proposed patch Struck me that if sites are using other address fields then they would want to see those as well as the Zip code
you're right, we should stick it all in there. and thanks for being fast on your patch too.
Created attachment 10590 [details] [review] Bug 8125 Sip addess should include all address fields Expansion of Liz Rea's original patch Bug report specifically mentioned kack of the Zip/Postal code but all used address fields should be included. Moved the address generation to its own sub. Hopefully using an if else will read more clearly than the original ternary operator proved to be Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
QA comment: small patch, does the job. The next if / if / else / ... of _get_address could have been written in a smaller number of lines, but that's not worth failing QA
Chris, your decision, but maybe worth porting to 3.8
This patch was marked as status 'pushed to Master' but its not actually been applied.
(In reply to comment #8) > This patch was marked as status 'pushed to Master' but its not actually been > applied. I confirm. I must have made a mistake... back to passed QA for Jared
This patch does not apply, and I'm not quite sure how to resolve the conflict. Please attach a rebased patch and reset status to "Passed QA."
Created attachment 14169 [details] [review] Rebased patch Rebased patch to fix problem caused by interim changes to indebtation (taps -> spaces)
Status reset as per Jared's request
This patch has been pushed to master.
Created attachment 21884 [details] [review] Bug 8215 - Course Reserves - Omnibus - v3.12.05 Bug 8215 - Course Reserves Adds a course reserves system for academic libraries. The course reserves system allows libraries to create courses and put items on reserves for those courses. Each item with at least one reserve can have some of its attributes modified while it is on reserve for at least one active course. These attributes include item type, collection code, shelving location, and holding library. If there are no active courses with this item on reserve, it's attributes will revert to the original attributes it had before going on reserve. Test Plan: 1) Create new authorised value categories DEPARTMENT and TERM 2) Create a new course, add instructors to that course. 3) Reserve items for that course, verify item attributes have changed. 4) Disable course, verify item attributes have reverted. 5) Enable course again, verify item attributes again. 6) Delete course, verify item attributes again. 7) Create two new courses, add the same item(s) to both courses. 8) Disable one course, verify item attributes have not reverted. 9) Disable both courses, verify item attributes have reverted. 10) Enable one course, verify item attributes are again set to the new values. 11) Edit reserve item attributes, verify. 12) Disable all courses, edit reserve item attributes, verify the item itself still has its original attributes, verify the reserve item attributes have been updated. 13) Verify the ability to remove instructors from a course. 14) Verify new permissions, top level coursereserves, with subpermissions add_reserves and delete_reserves. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> http://bugs.koha-community.org/show_bug.cgi?id=8125 Bug 8215 follow-up encoding for branches & itemtypes Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: Followup FIX QA issues Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215 - Add Course Reserves - QA Followup Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: Followup Fix confirmation links for delete course and item Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: FIX ergonomic issue : 'Unchanged()' bug 8215: (followup) run new files through perltidy Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) make sure C4::CourseReserves doesn't export anything New modules should not export any symbols by default without a very good reason. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) don't allow deleting course reserves from OPAC Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) avoid SQL syntax error in logs ModItem currently will attempt to update an item even if no field updates are specified. This patch avoids (harmless) error messages in the Apache logs if an item is not actually being changed when it is placed or taken off reserve. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) rename GetItemReservesInfo Renamed that routine to GetItemCourseReservesInfo in order to avoid any potential confusion with reserves qua hold requests. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) remove extraneous underscore in template Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 23263 [details] [review] Bug 8215 - Course Reserves - Omnibus - v3.12.07 Bug 8215 - Course Reserves Adds a course reserves system for academic libraries. The course reserves system allows libraries to create courses and put items on reserves for those courses. Each item with at least one reserve can have some of its attributes modified while it is on reserve for at least one active course. These attributes include item type, collection code, shelving location, and holding library. If there are no active courses with this item on reserve, it's attributes will revert to the original attributes it had before going on reserve. Test Plan: 1) Create new authorised value categories DEPARTMENT and TERM 2) Create a new course, add instructors to that course. 3) Reserve items for that course, verify item attributes have changed. 4) Disable course, verify item attributes have reverted. 5) Enable course again, verify item attributes again. 6) Delete course, verify item attributes again. 7) Create two new courses, add the same item(s) to both courses. 8) Disable one course, verify item attributes have not reverted. 9) Disable both courses, verify item attributes have reverted. 10) Enable one course, verify item attributes are again set to the new values. 11) Edit reserve item attributes, verify. 12) Disable all courses, edit reserve item attributes, verify the item itself still has its original attributes, verify the reserve item attributes have been updated. 13) Verify the ability to remove instructors from a course. 14) Verify new permissions, top level coursereserves, with subpermissions add_reserves and delete_reserves. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> http://bugs.koha-community.org/show_bug.cgi?id=8125 Bug 8215 follow-up encoding for branches & itemtypes Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: Followup FIX QA issues Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215 - Add Course Reserves - QA Followup Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: Followup Fix confirmation links for delete course and item Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Bug 8215: FIX ergonomic issue : 'Unchanged()' bug 8215: (followup) run new files through perltidy Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) make sure C4::CourseReserves doesn't export anything New modules should not export any symbols by default without a very good reason. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) don't allow deleting course reserves from OPAC Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) avoid SQL syntax error in logs ModItem currently will attempt to update an item even if no field updates are specified. This patch avoids (harmless) error messages in the Apache logs if an item is not actually being changed when it is placed or taken off reserve. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) rename GetItemReservesInfo Renamed that routine to GetItemCourseReservesInfo in order to avoid any potential confusion with reserves qua hold requests. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> bug 8215: (followup) remove extraneous underscore in template Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>