Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Jonathan Druart	19a977dc7b	Bug 15758: Koha::Libraries - Remove GetBranchName This is the fourth and last patch set to remove C4::Branch. The real purpose of this patch is to standardise and refactor some code which is related to the libraries selection/display. Its unconfessed purpose is to remove the C4::Branch package. Before this patch set, only 6 subroutines still existed in the C4::Branch package: - GetBranchName - GetBranchesLoop - mybranch - onlymine - GetBranches - GetBranch GetBranchName basically returns the branchname for a given branchcode. The branchname is only used for a display purpose and we don't need to retrieve it in package or pl scripts (unless for a few exceptions). We have a `Branches` template plugin with a `GetName` method which does exactly this job. To achieve this removal, we will use this template plugin and delete the GetBranchName from pl and pm files. The `Branches.all()` will now select the library of the logged in user if no `selected` parameter has been passed. This new behavior could cause regressions, for instance there are some places where we do not want an option preselected (batch item modification for instance), keep that in mind when testing. GetBranchesLoop took 3 parameters: $branch and $onlymine. The first one was used to set a "selected" flag, for a display purpose: select an option in the libraries dropdown lists. The second one was useless: If not passed or set to 0, the `C4::Branch::onlymine` subroutine was called. This onlymine flag was use to know if the logged in user was able to see other libraries infos. A patron can see the infos from other libraries if IndependentBranches is not set OR if he has the superlibrarian permission. Prior to this patch set, the "onlymine test" was done on different places (neworderempty.pl, additem.pl, holidays.pl, etc.), including the Branches TT plugin. In this patch set, this test is only done on one place (C4::Context::only_my_library, code moved from C4::Branch::onlymine). To accomplish the same job as this subroutine, we just need to call the `Branches.all()` method from the `Branches` TT plugin. It already accepts a `selected` parameter to set a flag on the option to select. To avoid the repetitive [% IF selected %]<option selected="selected">[% ELSE %]<option>[% END %] pattern, a new `html_helpers` TT include file has been created, it defines an `options_for_libraries` block, which takes a `selected` parameter. We could imagine to use this include file for other selects. The 'mybranch` and `onlymine` subroutines of the C4::Branch package have been moved to C4::Context. onlymine has been renamed with only_my_library. There are only 4 occurrences of it, against 11 before this patch set. There 2 subroutines are Context-centric and it makes sense to put them in `C4::Context` (at least it's the least worst place!) GetBranches is the tricky part of this patch set: It retrieves all the libraries, independently of the value of IndependentBranches. To keep the same way as the existing calls of `Branches.all()`, I have added a `unfiltered` parameter. If set, the `Branches.all()` will call a usual Koha::Libraries->search method, otherwise Koha::Libraries->search_filtered will be called. This new method will check if the logged in user is allowed to see other libraries or only its library. Note that this `GetBranches` subroutine also created a `category` key: it allowed to get the list of groups (of libraries) where this library existed. Thanks to a previous patch set (bug 15295), this value was not used anymore (I may have missed something!). Note that the only use of `GetBranch` was buggy (see bug 15746). Test plan (for the whole patch set): The best way to test this whole patch set is to test with 2 instances: 1 with the patch set applied, 1 using master, to be sure there is no regression. It would be good to test the same with `IndependentBranches` and the without `IndependentBranches`. No difference should be found. The tester must focus on the library dropdowns on as many forms as possible. You will notice changes in the order of the options: the libraries will now be ordered by branchname (instead of branchcode in some places). A special attention will be given to the following page: - acqui/neworderempty.pl - catalogue/search.pl - members/members-home.pl (header?) - opac/opac-topissues.pl - tools/holidays.pl - admin/branch_transfer_limits.pl - admin/item_circulation_alerts.pl - rotating_collections/transferCollection.pl - suggestion/suggestion.pl - tools/export.pl Notes for QA: - There are 2 FIXMEs in the patch set, I have kept the existing behavior, but I am not sure it's the good one. Feel free to open a bug report and I will fill a patch if you think it's not correct. Otherwise, remove the FIXME lines in a follow-up patch. - The whole patch set is huge and makes a lot of changes. But it finally will tremendously reduce the number of lines: 716 insertions for 1910 deletions Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	363e45a5eb	Bug 14060: Force the input to contain a valid date Before this patch, the user was still allowed to enter a valid date. Now, if the date is not valid, the input is emptied. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Jonathan Druart	d53fb6db6a	Bug 14060: Add OnClose event on missing datepicker The "suspend until" inputs (hold list on circ/circulation.pl and members/moremember.pl) were not set in the same way. The minDate option should be set for both (bug 10703 removed it for circ/circulation.pl). This patch reintroduces the option and add the OnClose event on both. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Jonathan Druart	f91ed3d8bf	Bug 14060: Remove readonly attributes on date inputs In order to remove accessibility issues due to the readonly attributes on date inputs, this patch will remove them and introduce a javascript validation on them. This patch is not perfect for some reason: I didn't manage to force the user to select a valid date. One solution would be to reopen the datepicker plugin until a valid date is inserted. But it could be annoying for users (and for me: I did not manage to implement this solution). You will note that input is emptied if the date is not valid. This is a quick and efficient solution to prevent submitting invalid date and make Koha explodes. A proper solution would be to implement the check server side send a friendly message to the user. Test plan: For all inputs, try an invalid and a valid date. 1/ Debar a patron 2/ On the checkout tables (circulation and moremember), add a renewal due date (at the bottom of the tables) 3/ On the checkout page, specify a due date 4/ On the return page, specify a return date 5/ On the invoice page (acquisition module), enter a shipment and billing date 6/ On the invoice search page (invoices.pl) use filters shipment and billing dates 7/ On the offline circ page, specify a due date 8/ On the edit patron page (memberentry), add a debarment 9/ On the reserve page (reserve/request.pl), use the date inputs to suspend until a defined date 10/ Edit patrons in a batch (tools/modborrowers.pl) and use the registration and expiry date inputs Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Owen Leonard	27a7cdef1a	Bug 16893: Missing closing tag disrupts patron detail page style A missing closing </i> causes the the patron detail page to be in all italics if the patron has a restriction message. This patch corrects it. To test, apply the patch and locate a patron who has a restriction message. The restriction message should be in italics but the rest of the page should display normally. Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Rest of the page displayed normally Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Marc Véron	03795b65d5	Bug 10760: Alternate Address: Display street number and street type This patch displays alternate streetnumber and street type on patron's detail page. To test: - Apply patch - Verify that the alternate address information displays follwing the setting in syspref AddressFormat and contains street type and street number (as appropriate) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Alex Sassmannshausen	6a493842cf	Bug 6906 - show 'Borrower has previously issued... New feature: provide granular means to configure warnings about items that have been issued to a particular borrower before, according to their checkout history. - Global syspref ('CheckPrevCheckout'), set to 'hardno' by default, allows users to enable this feature library wide. - Per patron category pref allows libraries to create overrides per category, falling back on the global setting by default. - Per patron pref allows switching the functionality on at the level of patron. Fall-back to category settings by default. * Koha/Patron (wantsCheckPrevCheckout, doCheckPrevCheckout): New methods. * C4/Circulation.pm (CanBookBeIssued): Introduce CheckPrevCheckout check. * admin/categories.pl: Pass along checkprevcheckout. * koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt: Expose CheckPrevCheckout per category setting. * koha-tmpl/intranet-tmpl/prog/en/modules/preferences/patrons.pref: Expose CheckPrevCheckout syspref. * koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt: Expose per patron CheckPrevCheckout preference. * koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt: Expose per patron CheckPrevCheckout preference. * koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt: Add 'CHECKPREVCHECKOUT' confirmation message. * installer/data/mysql/kohastructure.sql: Modify structure of 'categories', 'borrowers', 'oldborrowers'. * installer/data/mysql/sysprefs.sql: Add 'CheckPrevCheckout'. * installer/data/mysql/atomicupdate/checkPrevCheckout.sql: New file. * t/db_dependent/Patron/CheckPrevCheckout.t: New file with unit tests. Test plan: - Apply patch. - Run updatedatabase. - Regenerate Koha Schema files. - Run the unit tests. - Verify 'CheckPrevCheckout' is visible in Patrons sysprefs and can be switched to 'hardyes', 'softyes', 'softno' and 'hardno'. + Check out previously checked out items to a patron, checking the message appears as expected. - Verify no 'Check previous checkouts' setting appears on the borrower category pages if the syspref is set to a 'hard' option. - Verify 'Check previous checkouts' setting appears on the borrower category pages and can be modified per borrower category. + Issue previously issued items to a borrower, checking the message appears as expected (This setting should override the default setting if that is set to a 'soft' option). - Verify no 'Check previous checkouts' setting appears on the individual borrower pages if the syspref is set to a 'hard' option. - Verify 'Check previous checkouts' setting appears on individual borrower pages and can be modified. + Issue previously issued items to a borrower, checking the message appears as expected (This setting should override the category setting and the default setting if the latter is set to a 'soft' option). Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Morgane Alonso	a1285ba9c0	Bug 12509 - Fix Untranslatable Restriction added by overdues process Changes the value of the "comment" column in "borrower_debarments" table from "Restriction added by overdues process yyyy-mm-dd hh:mm:ss" to "OVERDUE_PROCESS yyyy-mm-dd hh:mm:ss" in the overdue_notices.pl. Then in the templates "moremember.tt", "circulation.tt", "memberentrygen.tt", "opac-reserve.tt" and "opac-user.tt" the value of "comment" is check, if it's an automatical comment due to overdue process it'll write "Restriction added by overdues process yyyy-mm-dd hh:mm:ss", then if there is a customizable comment it will be written without modification. Like this, the comment "Restriction added by overdues process" is written in the po files and can be translated later. To test: 1) create a patron with automatical restriction due to overdue process; 2) apply patch; 3) run misc/cronjobs/overdue_notices.pl; 4) verify if the comment "Restriction added by overdues process" is well written and translatable on the following page : - opac patron home page (opac-user.tt); - opac item reservation page (opac-reserve.tt); - pro patron page (moremember.tt); - reservation item for a patron (circulation.tt, memberentrygen.tt); 5) try to translate the comment in po files; 6) sign off. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Owen Leonard	0336f32b65	Bug 16494 - Remove the use of "onclick" from some patron pages This patch removes the use of "onclick" attributes from some patron pages. To test, apply the patch and: - In Patrons, perform any search which will return multiple results. Confirm that the "select all" and "clear all" links work as expected. Font Awesome icons have been added to these links. In the left-hand sidebar, change any of the filters and click the "Clear" button. The form (and your search results) should reset. - Open the 'Set permissions' page for any patron. Checking any permission with sub-permissions should correctly expand the tree and select all sub-permissions. The reverse should also work. Also changed in this file: The "Inconsistency detected" alert has been reformatted to make it translatable. - View the detail page for a patron with one or more restrictions. Clicking the "View restrictions" link at the top of the page should jump you to and activate the restrictions tab. - View the 'Notices' tab for a patron who has been sent one or more notices. Click any notice title to expand the notice. Clicking the "resend" button should resend the notice. - Create a new patron with the same first and last name as an existing patron. This should trigger a duplicate warning message. Click the "View existing record" link to trigger a pop-up window with a patron detail brief view. In this window an "email" class has been added to the primary and secondary email lines so that long email addresses don't overlap the second column of data. Confirm that clicking the "close" button in this window closes the window. The changes to staff-global.css are included in this patch to prevent the close button from having an incorrect color change on hover. Signed-off-by: FILIPPOS KOLOVOS <f.kolovos@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Aleisha	573f1ac474	Bug 3669: Moving 'Add a new message' into a pop up box and adding to patron toolbar This patch moves all the code into an include which can be accessed from the 'Add a new message' link or the patron toolbar. EDIT: Ensuring modal opens on all pages EDIT2: Once the form has been submitted the page will redirect to where you submitted the form from. EDIT3: Fixing indentation of member-add-message.inc Ensuring messages save on every page Fill branch Ensure predefined notes appear Form redirects to where it was submitted from, or just the circulation page. EDIT4: Removing the new include file and moving it all into the modal in the toolbar EDIT5: Removing swp file and unnecessary code duplication by utilising plugins EDIT6: Batch checkout fixes EDIT7: Ensure you do not get JS error from Comment 24 (Batch checkout syspref must be turned on) To test: 1) Go to a patron circ page (circ/circulation.pl?borrowernumber=X) 2) Click 'Add a new message' under Messages 3) Confirm this brings up the modal to add a message. Confirm clicking Save saves your message. If it is an OPAC message (for the user), confirm it shows as expected on the OPAC. 4) Click Cancel. Confirm this closes the modal. 5) Click 'Add message' button in toolbar. Complete steps 3 and 4. 6) Confirm the modal opens from all other pages with the members toolbar. Confirm predefined notes shows. circ/circulation.pl members/moremember.pl members/routing-lists.pl members/statistics.pl members/boraccount.pl members/pay.pl members/maninvoice.pl members/mancredit.pl members/readingrec.pl members/notices.pl members/member-flags.pl members/member-password.pl members/paycollect.pl members/files.pl turn on BatchCheckouts syspref and put in appropriate patron category circ/circulation.pl?borrowernumber=X&batch=1 7) Confirm that the page redirects to where you submitted the form from once you have submitted it. 8) Go to Check Out tab and confirm your message saved (or OPAC, wherever you saved it) Sponsored-by: Catalyst IT Followed test plan, works as expected. (Re-tested for comment #24) Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Claire Gravely	78b2fde348	Bug 16642 - Fix capitalisation for upload patron image To fix capitalisation on the staff interface when patronimages is turned on. Test plan: 1. In staff interface. Turn on patronimages sys preference. 2. Go to a patron without an image and check that the "Upload patron image" box heading now has correct capitalisation. 3. Go to a patron with an image already uploaded and check the "Manage patron image" box heading has correct capitalisation. Signed-off-by: Sofia <szapoun@lib.auth.gr> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>	8 years ago
Owen Leonard	5e1bcc4aa7	Bug 16242 - Move staff client JavaScript out of language directory This patch moves the JavaScript files in prog/en/js to prog/js. JavaScript files do not need to be in the directory which is processed by the translator. To test, apply the patch and visit various pages in the staff client to confirm that JavaScript files are still loading correctly. Revised: I intended for this to be built on top of Bug 15883 as well as Bug 16242. Now it is. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> On top of 15883 and 16241 All seems to work, js files pulled from new dir. No errors Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Owen Leonard	f5ad462489	Bug 16241: Move staff client CSS out of language directory This patch corrects CSS paths in three places I missed. To test, apply this follow-up and: - View the patron detail page. DataTables should be styled correctly. - View the tag review page. DataTables should be styled correctly. - From the tag review page, click any tag to see a list of titles with that tag. The DataTable on that page should be styled correctly. Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as expected Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Kyle Hall	b75d982be0	Bug 14497 [QA Followup] - Refactor code to have a single source for message Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Kyle Hall	cf6bd4d982	Bug 14497 - Add warning to patron details page if patron's fines exceed noissuescharge Some librarians have requested that the same warning on the check out page be placed on the patron details page if a patron's fines exceed the system preference noissuescharge. Test Plan: 1) Apply this patch 2) Find or create a patron who's fines exceed noissuescharge 3) Browse to that patron's details ( moremember.pl ) 4) You should see a warning near the top of the page with links to the patron's account page and the pay fines page Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Patch ammended post sign-off Signed-off-by: Sally Healey <sally.healey@cheshiresharedservices.gov.uk> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Aleisha	87ae49399d	Bug 16182: Make phone number clickable to call EDIT: fixing typo, changing sms number from tel: to sms: To test: 1) Go to a patron detail page 2) Confirm that all available phone numbers can be clicked and allow you to call this number from your device a) in the top left circ-menu.inc b) primary/secondary/other/organisation/mobile phone numbers c) alternate address phone number d) alternate contact phone number e) enable the EnhancedMessagingPreferences system preference. check the SMS number under Patron messaging preferences (back on the detail page) is clickable 3) Check to see if there are any phone numbers I have missed. Sponsored-by: Catalyst IT Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Nick Clemens	e4d0363bc7	Bug 15928 - Show unlinked guarantor To test: 1 - Add guarantor data to patron account by typing it in but do not 'Set to patron' 2 - Note it is not displayed on patron details 3 - Apply patch 4 - Note the info is displayed 5 - Test that linked guarantors show as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Amended-patch: Correct some indents/spaces Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Aleisha	1870141874	Bug 16029: Hide patron toolbar if patron does not exist To test: 1) Create a patron, take note of the borrower number 2) Delete the patron 3) Navigate to the page of the patron you just deleted by typing the url (ie /cgi-bin/koha/members/moremember.pl?borrowernumber=X) 4) Confirm that the patron toolbar is not showing on the page 5) The message now has a link that says 'Find another patron?'. Click this link and confirm you are taken to the member home pgae. Sponsored-by: Catalyst IT Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Jonathan Druart	bff0ca0b0b	Bug 15656: Move guarantor/guarantees code - GetGuarantees 2 subroutines of C4::Members deal with guarantor/guarantees: GetGuarantees and GetMemberRelatives. Since we already have a Koha::Patron->guarantor method, it makes sense to move these 2 subroutines to this module. This first patch deals with GetGuarantees. Test plan for the entire patch set: 1/ Create 5 patrons A (adult), B (child), C (child), D (child), E (child), F (adult) 2/ Add relation between them: A is father of B, C and D. E does not have a guarantor F does not have guarantees 3/ Check some items out for all of these patrons 4/ On the "Check out" and "Details" tabs, you should not see any differences with these patch applied : The "Relatives' checkouts" tabs should list all of the guarantor/guarantee/siblings checkouts Note: $template->param('C' => 1); I have not found any reference of this 'C' in the template. It seems it's an old c/p from members/memberentrygen.tt Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Owen Leonard	80a71c1689	Bug 13302 [Revised] Use CSS3 ellipsis for email address in staff client patron sidebar This patch replaces the email address text overflow solution implemented by Bug 3256 with a CSS3 technique: text-overflow: ellipsis https://developer.mozilla.org/en-US/docs/Web/CSS/text-overflow To test, apply the patch and clear your browser cache. Edit the primary email address of a patron so that it is very long. View that patron in the staff client (on the checkout or details page, for instance) and confirm that the email address is truncated with "..." Confirm that the link and the title attribute of the link contain the correct, full email address. Revision uses a percentage instead of a fixed width for email display in the sidebar to accommodate varying sidebar widths. Also added: Handling of all email addresses displayed on the patron detail page. Although email addresses in the body of that page were not in the scope of the original patch, it's a good improvement to include those as well. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	10 years ago
Natasha	17190de524	bug 12920 - Remove AllowRenewalLimitOverride from pl scripts and tt files, use Koha.Preference instead Test Plan: 1) Apply this patch 2) Go to circulation.pl 3) Ensure you can still override renewal limits with pref enabled 4) Ensure you can not override renewal limits with pref disabled 5) Go to moremember.pl 6) Repeat steps 3-4 Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Kyle Hall	a8942c2884	Revert bug 13618 - "Prevent XSS in the Staff Client and the OPAC" due to performance issues Revert "DBRev to make notes of the XSS patches and the new important dependency." This reverts commit `e140603a59`. Revert "Bug 13618: Specific for branches.opac_info" This reverts commit `06e4a50f00`. Revert "Bug 13618: (follow-up) Specific for other prefs" This reverts commit `d6475a111f`. Revert "Bug 13618: Fix for debarredcomment and patron messages" This reverts commit `dd98c9df92`. Revert "Bug 13618: Do not display html tags in patron's notices" This reverts commit `a065b243fe`. Revert "Bug 13618: Do not display   and html tags in item fields content" This reverts commit `baeeaffbf8`. Revert "Bug 13618: Fix for system preference description" This reverts commit `a967a09261`. Revert "Bug 13618: Remove html filters for newly pushed code" This reverts commit `0e98662b10`. Revert "Bug 13618: (follow-up) add missing lines for opac-shelves" This reverts commit `fc2fb605e5`. Revert "Bug 13618: (follow-up) Specific for ColumnsSettings" This reverts commit `bc308fdd9c`. Revert "Bug 13618: Fix for edit biblios and items" This reverts commit `811c4e8402`. Revert "Bug 13618: followup to remove tabs" This reverts commit `ca8e8c397c`. Revert "Bug 13618: Fix last occurrences recently introduced to master" This reverts commit `bb417b256b`. Revert "Bug 13618: Fix for news" This reverts commit `ae5b98020a`. Revert "Bug 13618: Fix escape on sending baskets or shelves by email" This reverts commit `a7731ffe25`. Revert "Bug 13618: Specific for XSLTBloc" This reverts commit `11fa38dc29`. Revert "Bug 13618: Specific for Salutation on editing a patron" This reverts commit `36c07ad6d3`. Revert "Bug 13618: Specific for other prefs" This reverts commit `e6ea281a3b`. Revert "Bug 13618 - memberentrygen.tt errors Not a GLOB reference" This reverts commit `7824874557`. Revert "Bug 13618: Specific for ColumnsSettings" This reverts commit `1834da3da3`. Revert "Bug 13618: Specific for IntranetUser* and OPACUser* prefs" This reverts commit `21ae62b253`. Revert "Bug 13618: Fix error 'Not a GLOB reference'" This reverts commit `602bdbab4c`. Revert "Bug 13618: Specific for the ISBD view" This reverts commit `d254362435`. Revert "Bug 13618: Specific for pagination_bar" This reverts commit `8837a8ae68`. Revert "Bug 13618: Specific places where we don't need to escape variables - intra" This reverts commit `00eff140b3`. Revert "Bug 13618: Remove html filters at the intranet" This reverts commit `7db851ff03`. Revert "Bug 13618: Specific places where we don't need to escape variables" This reverts commit `49a3738b8d`. Revert "Bug 13618: Remove html filters at the OPAC" This reverts commit `cedaa0e23e`. Revert "Bug 13618: Use Template::Stash::AutoEscaping to use the html filter" This reverts commit `01b38d3b13`. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Jonathan Druart	dd98c9df92	Bug 13618: Fix for debarredcomment and patron messages At the OPAC and intranet. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Jonathan Druart	1834da3da3	Bug 13618: Specific for ColumnsSettings Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	9 years ago
Jonathan Druart	602bdbab4c	Bug 13618: Fix error 'Not a GLOB reference' The interpolation of a variable on including a file caused an unexpected error: Template process failed: undef error - Not a GLOB reference at /usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619. The easier fix is to replace it with a SWITCH. Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	9 years ago
Kyle Hall	c60c8f0821	Bug 14310 - Suspend and resume indvidual holds from patron holds table This enhancment adds the ability to suspend and resume individual holds from the holds table on circulation.pl and moremember.pl. The interface is inspired/cribbed from the same feature already available in the opac. Test Plan: 1) Apply this patch 2) Find a patron with holds 3) Suspend a hold with no resume date 4) Resume the suspended hold 5) Suspend a hold with a resume date 6) Resume the suspended hold Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	9 years ago
Aleisha	b124540ee9	Bug 14763: Calculate and display patron age To test: 1) Go to patron Details page (ie http://localhost:8081/cgi-bin/koha/members/moremember.pl?borrowernumber=51) 2) Confirm that '(x years)' is showing next to the Date of Birth and is correct according to DOB (ie if DOB: 30/11/1996, Age: 19 years) 3) Edit date of birth to be a month later (ie from 30 November to 30 December) so that, as of the date you are testing, the patron has not had their birthday yet 4) Confirm that age changes to be one year younger 5) Edit date of birth to be a different year 6) Confirm that age changes accordingly Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Jonathan Druart	bde685fa92	Bug 15542: Always display the patron's info the same way. The patron's information displayed in the member module (includes/circ-menu.inc and includes/member-display-address-style-*.inc) are not always displayed the same way. Sometimes the streetnumber is missing, sometimes it's the streettype. Sometimes the streettype is after the address, sometimes before... Test plan: Go on a patron detail page, and open all the tabs on the left (Check out, Fines, Notices, etc.) Without this patch, the patron's info displayed will differ from one page to another. With this patch, they will be displayed the same everywhere. Followed test plan, works as expected. (Tested both patches together.) Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Kyle Hall	3ebf343af6	Bug 9303 [3] - relative's checkouts in the opac Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Aleisha	3da8abcfef	Bug 15373: Changing Zip to ZIP on OPAC and Intranet To test: 1) Login to OPAC --> You personal details. 2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact 3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details. 4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact 5) Click Edit 6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact Signed-off-by: Barry Cannon <bc@interleaf.ie> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> NOTE: Tested together with second patch. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	9 years ago
Alex Arnaud	eb5fca30aa	Bug 15289 - borrowers permission allows to see patron's loans Test plan: - log with a user that have "borrowers" permission but not "Remaining circulation permissions" - go to a borrower's detail page (who has at least a loan) and click on "show checkouts" - check that you see loan(s) and that you can't renew and checkin - Do the same with a borrower that have "Remaining circulation permissions" - check that you see loan(s) and that you can renew and checkin Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	9 years ago
Jonathan Druart	6506ddd1e8	Bug 14990: Format the date template-side for moremember Test plan: print slip and show the member detail page, the 3 dates date of birth, date enrolled and date of expiry should be displayed correctly. Followed test pan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Jonathan Druart	8b7e1f4583	Bug 14841: Columns settings are not taken into account for checkout table / moremember There is a typo member vs members in the template when retrieving the existing settings. So that all columns are displayed, even the ones which are hidden (sort_order, due_date_unformatted, etc.) Test plan: 0/ Does not apply this patch 1/ Go on the columns config page and check some fields not to display by default for Patrons > moremember > issues-table 2/ Go on the patron detail page (with checkouts), click on the "show/hide columns" button (top right of the table). Confirm that the config is not taken into account and that it's ugly (hidden columns are displayed) 3/ Apply this patch 4/ Everything should be fine now :) Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Jonathan Druart	fb59c5c7c4	Bug 10020: Remove code related to ethnicity This is a(nother) vestige of Koha (2.2?). This patch removes unused code related to the 'ethnicity'. In detail: There is no way to fill the ethnicity table. There is no way to fill the borrowers.ethnicity and borrowers.ethnotes. BUT if borrowers.ethnicity exists, the value is displayed on members/moremember.pl (and only here). Test plan: Apply this patch and confirm there is no regression on adding/updating/deleting patrons. Note that you don't see the ethnicity value on the moremember.pl page even if a patron has it. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Genevieve Plantin	e0e3efacca	Bug 13781: Fix relatives's checkouts missing heading columns There was two missing heading columns (location and fine) and one hidden heading missing column (this hidden column is needing for sorting the table) it was taking the due_date column for the hidden column, so I added them Both patches tested together. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	9 years ago
Kyle Hall	721a77e669	Bug 14338: Unable to delete patron images The call to RmPatronImage is still passing cardnumber as its parameter instead of borrowernumber. Test Plan: 1) Upload a patron image 2) Ensure the card number is not the same as the borrower number 3) Attempt to delete patron image -- Image will remain 4) Apply this patch 5) Attempt to delete patron image -- Image will be removed 6) run koha qa test tools Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Marc Véron	c7a4b7e51b	Bug 14077: Remove unused AUTH_UPDATE_FAILED from moremember.tt 'AUTH_UPDATE_FAILED' in moremember.tt is never set and should be removed (see comment #6 on Bug 13910). To verify: git grep 'AUTH_UPDATE_FAILED' Result: Only one occurence (in moremember.tt) Test plan: - Apply patch (on top of Bug 13910) - Verify that the part with AUTH_UPDATE_FAILED is removed from moremember.tt - Go to a patron's detail page and verify that nothing is broken (Home > Patrons > Patrons details for...) Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> This has been introduced by commit `1a91801b06` Date: Sat Dec 1 20:56:27 2007 -0600 Add Staff member type. Add permissions checks for bug# 1269 and related permissions on memberentry and mods. But was already not used... Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Marc Véron	eb80bedc29	Bug 13910: Line with AUTH_UPDATE_FAILED restored As of comment #6 Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> This should be fixed in a separate patch, this error is not sent to the template and the related code could be removed. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Marc Véron	1a54f0916e	Bug 13910: Prevent delete of one's own patron account This patch adds a check to prevent deleting the user's own account. Additionali it fixes a "missing link" in moremember.pl and wrong comparisions in moremember.tt regarding other forbidden deleting. To test: - Apply patch - Create a user with sufficient privileges to delete users - Log in as this new user - Try to delete this user. Confirm message box "Are you sure..." - Confirm that you get a message "Not allowed to delete own account" and that the user still exists. Bonus test: Try to trigger other forbidden deletions (see members/deletemem.pl): 'CANT_DELETE_STAFF', 'CANT_DELETE_OTHERLIBRARY', 'CANT_DELETE' (You can fake it by using an URL like: /cgi-bin/koha/members/moremember.pl?borrowernumber=115&error=CANT_DELETE_STAFF etc.) Without patch, no message appears. With patch, messages appear as appropriate. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> NOTE: Attempted all CANT combinations. From reading the code, this is kind of an important patch, because I'm not sure deleting error messages work at all right now based on what I read. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Owen Leonard	93c875f603	Bug 9528: Add delivery branch to the place hold display When viewing the list of a patron's holds from the circulation or patron detail page the pickup library is not listed. This patch adds a column to the table of holds which shows the pickup branch. This patch also removes some unnecessary markup from the generation of the table and corrects an instance where the term "reserve" was used instead of "hold." This patch also modifies the language describing an item which is marked waiting at the current library: "Item is waiting here" instead of "Item waiting." To test, add several holds to a patron's account with various pickup locations. - Confirm that those pickup locations are correctly displayed under the Holds tab in Circulation. - Check in and confirm a hold which is to be picked up at the current branch. Confirm that the revised language appears. - Confirm that table sorting works correctly. Signed-off-by: Nick <Nick@quechelibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Kyle Hall	8e4735013b	Bug 4041: (QA followup) Change addressformat to AddressFormat Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> ---- Amended to resolve conflict in sysprefs.sql / mveron Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Marc Véron	117ee49514	Bug 4041: Third step - Display address on patron's pages using the system preference This patch displays the address information in the left column of the patron's pages using the new system preference. The address is formatted in member-display-address-style-us.inc and member-display-address-style-de.inc To test: - Apply patch on top of 1st and 2nd patch - Select 'German style' in system preference 'addressformat' in I18N/L10N - Verify that the address information displays properly in the left column of all patron's pages. - Verify that the address displays properly in the main area of moremember.pl as well (Note: In right column, Alternate address /contact are not yet touched)) - Switch system preference to US style, repeat checks Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> AMending without changes to put this patch at the end of the patch list / Marc Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Jonathan Druart	6ebdbf0481	Bug 9878: Add consistentcy on restriction messages Between both pages circ/circulation.pl and members/moremember.pl, the restriction messages should be the same. Test plan: 1/ Add a non-unlimited restrictions to a patron 2/ Go on both pages and confirm the restriction message is the same. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Jonathan Druart	06cde076c7	Bug 13492: Add the column configuration for the checkouts table - morember.pl Test plan: 1/ Verify that you can show/hide columns on the checkouts table (moremember.pl). 2/ Play with the column configuration admin page (admin/columns_settings.pl), and confirm the behavior is correct (depends on what you have selected). Amended patch: replace 'un' and 'deux' with 'sort_order' and 'todays_or_previous_checkouts' in the yml file. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Marc Véron	e0863d9711	Bug 13657 - Don't show extra comma after guarantor name on patron details This patch suppresses the first name part (including comma) if first name is empty. This way, first name is still displays with natural persons, but not with organizations. To test: Apply this patch (without the first patch). Have one patron with a natural person as guarantor and one patron with an organization as guarantor. Verify that both display properly on the patron details page. Signed-off-by: Jesse Maseto <Jesse@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Owen Leonard	a7da45099f	Bug 13142 - Change "mobile phone" label back to "other phone" Labeling a phone number field "mobile phone" eliminates the usefulness of having the labels "primary" and "secondary." Generic labels let the user populate the fields according to their importance rather than their type. To test I recommend editing a patron record so that the values in the patron record contain a label matching the table column: borrowers.phone : 555-555-1234 (primary - phone) borrowers.phonepro : 555-555-5678 (secondary - phonepro) borrowers.mobile : 555-555-9012 (other - mobile) View this patron's information in the various affected templates and verify that the labels correctly match the data: - OPAC "your personal details" (opac-memberentry.pl) - Submit changes to primary, secondary, and other phone via the OPAC. In the staff client, view the confirmation for those changes. - Patron details in the staff client (moremember.pl) - Patron entry/edit in the staff client (memberentrygen.pl) - Patron duplicate confirmation in the staff client (you can navigate directly to /members/moremember.pl?borrowernumber=XXXX&print=brief) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Magnus Enger	290341d8db	Bug 11401: Add support for Norwegian national library card This patch makes it possible to sync patron data between Koha and the Norwegian national patron database, in both directions. In order to use this, the following information is necessary: - a username/password from the Norwegian national database of libraries ("Base Bibliotek"), available to all Norwegian libraries - a special key in order to decrypt and encrypt PIN-codes/passwords, which is only available to Norwegian library system vendors - a norwegian library vendor username/password See http://www.lanekortet.no/ for more information (in Norwegian). While this is of course an implementation of a specific synchronization scheme for borrower data, attempts have been made to prepare the ground for other sync schemes that might be implemented later. Especially the structure of the new borrower_sync table might be reviewed with an eye to how it might fit other schemes. To test: Since the password and cryptographic key needed to use this functionality is only available to Norwegian library system vendors, only regression testing can be done on the submitted code. Suggested things to check: - Apply the patch and make sure the database update is done. This should add the new "borrower_sync" table and five new systmpreferences under the "Patrons" > "Norwegian patron database" category: - NorwegianPatronDBEnable - NorwegianPatronDBEndpoint - NorwegianPatronDBUsername - NorwegianPatronDBPassword - NorwegianPatronDBSearchNLAfterLocalHit - Check that patrons can be created, edited and deleted as usual, when NorwegianPatronDBEnable is set to "Disable" - Check that the new tests in t/NorwegianPatronDB.pm run ok, e.g. on a gitified setup: $ sudo koha-shell -c "PERL5LIB=/path/to/kohaclone prove -v t/NorwegianPatronDB.t" instancename - Check that all the other tests still run ok - Check that the POD in the new files itroduced by this patch looks ok: - Koha/NorwegianPatronDB.pm - members/nl-search.pl - misc/cronjobs/nl-sync-from-koha.pl - misc/cronjobs/nl-sync-to-koha.pl - t/NorwegianPatronDB.t Sponsored-by: Oslo Public Library Update 2014-09-18: - Rebase on master - Split out changes to Koha::Schema - Incorporate new way of authenticating with NL Update 2014-10-21: - Rebase on master - Use Module::Load to load Koha::NorwegianPatronDB in non-NL-specific scripts and modules - Fix the version number of Digest::SHA - Fix a missing semicolon in kohastructure.sql Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Rafal Kopaczka	4235326c5f	Bug 13103: No checkouts count on member details page On member details page, number of issues are not shown. It's caused by, old variable name for issue count in Moremember.tt template. To test: Apply patch go to member details page and check if there's number alongside "Checkout(s)" tab. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Small template change for more consistency. Works nicely. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	2aebc84cc8	Bug 13190: Refactor the checkouts table template code This code is duplicated and should be centralised. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Jonathan Druart	47e2331bd0	Bug 13190: Reintroduce the checkouts export feature Bug 11703 breaks the checkouts export feature. To reproduce: Fill the ExportWithCsvProfile pref and go on the circ/circulation.pl page. The export column appears, but not the export button. Test plan: Go on the checkout list (circ/circulation.pl and members/moremember.pl) and verify the export column and the export button appears. If you click on the button, a file should be generated. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago

1 2 3

118 Commits (19a977dc7b779173c4a3e96b6b06dc35db663601)