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

Commit Graph

Author	SHA1	Message	Date
Katrin Fischer	bbf0d21284	Bug 26727: Fix <p/> appearing in the templates The self-closing p is not valid in HTML5: Error: Self-closing syntax (/>) used on a non-void HTML element. Ignoring the slash and treating as a start tag. To test: 1) - Activate Article requests - Search for a record to place an article request on in staff - Look up the patron - Verify the article request form looks ok 2) - Search for a list of patrons - Check 2 patrons and merge them using the button above the list - Verify the distance between the button and the table looks ok 3) - Create a new MARC modification template - Create a new action - Verify the distances between the first and second line of form elements looks ok 4) - Place a hold in staff - Click on the Suspend link in the holds table (not below) - Verify the modal looks ok Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	4 years ago
Owen Leonard	41f0f22cb2	Bug 26530: Use patron card number as checkbox label during patron merge This patch makes a minor change the the merge patrons template so that on the patron selection stage the user can click the card number to select the radio button. To test, apply the patch and perform a patron search in the patrons module. - In patron search results, select two patrons to merge. - Click the "Merge selected patrons" button. - On the page showing the two patrons to merge, click each of the card numbers to confirm that it selects the correct radio button. Signed-off-by: Jennifer <jennifer.marlatt@coronaca.gov> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	4 years ago
Owen Leonard	2d7eba5be3	Bug 22698: Fix incorrect button classes This patch builds on Bug 22023 in making further corrections to toolbar button classes. To test, apply the patch and view the following pages to confirm that toolbar buttons are consistent: - Acquisitions -> Vendor -> View basket. - Administration -> Additional fields -> Select a table. - Administration -> Audio alerts. - Catalog -> Advanced search -> More/fewer options link - Cataloging -> Edit record -> Advanced editor -> Advanced search. - Cataloging -> Edit record -> Advanced editor -> Macros. - Cataloging -> Edit record -> MARC21 008 value builder. - Cataloging -> Search results. - Circulation -> Checkout notes. - Circulation: Sticky due date clear button, view restrictions, override restrictions temporarily, add message, delete message - Course reserves: Toolbar buttons on that page and the course reserve detail page. - ILL requests -> View ILL requests. The "New ILL request" and "List requests" button. - Lists and Lists -> View list. - Patrons -> Search -> Merge patrons. - Patrons -> View patron -> "Edit" button on patron image (patronimages must be enabled). - Patrons -> View patron -> "More" menu -> Manage API keys. - Patrons -> View patron -> "More" menu -> Set permissions. - Patrons -> View patron -> Delete circulation message link. - Patrons -> View patron -> Edit patron. - Patrons -> View patron -> Housebound. - Reports -> Dictionary. - Serials -> Numbering patterns. - Serials -> Subscription -> Receive. - Tools -> Labels -> Manage -> Label batches: Export selected. - Tools -> Patron card creator -> Manage -> Card batches -> Edit batch. - Tools -> Patron card creator. The "New" and "Manage" buttons. - Tools -> Patron clubs. - Tools -> Quote editor -> Import quotes. - Tools -> Rotating collections. Toolbar buttons on that page and the collection view page. - Tools -> Tags. - Tools -> Upload local cover image. Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Jonathan Druart	5825026448	Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link when href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	dcd1f5d48c	Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	9 years ago
Jonathan Druart	81431ee28a	Bug 20226: Centralize update child code (CATCODE_MULTI) Code and variables to deal with the update child feature are not centralized but copied/pasted in several scripts. Which leads to issues obsviously (bug 20805 for instance). Moreover the strings used by the templates are also in several template files (or .inc) To deal with that this patch introduces the idea to create 1 .inc file per .js file Here we have members-menu.inc for members-menu.js Test plan: - Remove all your adult categories (categories.category_type='A') - Create a patron with a child category - Try to update to adult category => The entry does no longer appears! (This is a change in the behaviour) - Create one adult category - Update to adult category => There is a JS confirmation message, if you accept the patron will be updated to the adult category - Create (at least) another adult category - Create another child - Update to adult category => No more confirmation message but a popup to select the adult category - Pick one => The patron has been updated to the adult category Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Kyle Hall	51b774dc61	Bug 9302: Add error message if keeper patron is invalid Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	6797259d44	Bug 9302: Add error messages, correct number of unit tests in subtest 'Test Koha::Patrons::merge' Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	b24fae93b4	Bug 9302: Update div classes Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	0b0ddf9c90	Bug 9302: Wrap display_names block line with a span tag Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	7319f1526b	Bug 9302: Use patron-title.inc Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	b5afe2d81e	Bug 9302: Add button directing use to keeper's patron record Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	ed3ee3c89b	Bug 9302: Make the patron search show/hide more links work Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Tomás Cohen Arazi	253dbb758a	Bug 9302: (QA follow-up) Consistency follow-up This patch moves the Koha::Patrons->merge method into Koha::Patron->merge_with in the line of the discussed implementation for bug 15336. I agree with that implementation so I provide this follow-up. Tests are adjusted, the controller script is adapted too. The behaviour remains. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle M Hall	73e7661c49	Bug 9302: (QA follow-up) Dumper plugin isn't used Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle Hall	310b9b00b9	Bug 9302: (QA follow-up) Merge should be a transaction Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Kyle Hall	11a2970d0e	Bug 9302: Add ability to merge patron records It would be great if there were a merge patrons feature. If you accidentally end up with one patron with two cards it would be nice to merge their records together so that you don't lose their history or holds or anything. This patch adds a basic patron merge feature. It attempts to relink all patron related tables from the patron(s) to be merged. It does not attempt to relink librarian account related tables at this time. This feature does not attempt to automatically resolve issues such as duplicate holds. Such a feature could build upon this one though. Test Plan: 1) Apply this patch 2) Find two or more patrons 3) Perform a patron search that will bring them up on the same page of results, or add them all to a list of patrons. 4) Use the 'merge' button to begin the merging process 5) Choose a patron to keep 6) Verify the deleted patrons data ( checkouts, holds, etc ) are now linked to the kept patron Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ed Veal <eveal@mckinneytexas.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago

17 Commits (bbf0d21284924d6b7529017fc78178b98242aaee)