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

Commit Graph

Author	SHA1	Message	Date
Jonathan Druart	d3f3a55e0b	Bug 26234: Teach our KohaTable constructor the specific th classes We have different classes we can use to set specific behaviours on table columns: title-string, string-sort, anti-the and NoSort. We should not need to pass them to the DataTable constructor, we could teach it that we always want to apply them. It will avoid bug like bug 26233 The goal is to define them in a centralised place (columns_settings.inc) then only use the class on the th Test plan: Different behaviour and tables must be tested to confirm it works correctly. Focus must be put on table when aoColumnsDefs is passed from the template and confirm that this will add more info to aoColumnsDefs and not remove the existing ones. Note that this only work when KohaTable is used. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	4 years ago
Jonathan Druart	de54267510	Bug 24156: move ColumnsSettings to TablesSettings We are preparing the ground with this patch. As the "Columns settings" page will now add the ability to modify settings for the whole table, it makes sense to rename the file and the variables. Note that the controller script (admin/columns_settings.pl) and the yml (admin/columns_settings.yml) files have not been moved to not break shortcuts and abits people could have. But if QA decides, it could be easy to do. Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	5 years ago
Owen Leonard	247dca3064	Bug 23013: Upgrade DataTables in the staff client This patch upgrades DataTables and makes some style changes to the default DataTables toolbar style. DataTables assets are now combined and minified using their download customizer, bundling together these elements: - JSZip 2.5.0 - pdfmake 0.1.36 - DataTables 1.10.18 - Buttons 1.5.6 - Column visibility 1.5.6 - HTML5 export 1.5.6 - Print view 1.5.6 - FixedHeader 3.1.4 DataTables assets have been moved from lib/jquery/plugins to lib/datatables. The global header and footer include files are updated correspondingly. This patch removes the custom "four_button" pagination configuration and updates pages which used it to use the built-in "full" type instead. This is done for the sake of consistency and upgradability. This change touches a lot of files. Table-specific CSS has been moved from staff-global.scss to a new include, _tables.scss. A second common include, _mixins.scss has some variable definitions used in both files. Many images have been made obsolete by this change and have been removed. To test, apply the patch and regenerate the staff client CSS. View various pages in the staff client with tables: - Not formatted by DataTables: - Reports -> Most circulated items - Catalog -> Search results - Formatted by DataTables without column configuration - Acquisitions -> Vendor search - Lists - Formatted by DataTables with column configuration - Administration -> Libraries - Administration -> Item types - Reports -> Saved SQL reports - Non-standard DataTables configurations: - Circulation -> Checkouts - Administration -> System preferences - Reports -> Lost items Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	5 years ago
Ere Maijala	a1a05db1b6	Bug 11529: Add templates for biblio title display. Unify display. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	5 years ago
Owen Leonard	34fc147726	Bug 23061: Add column/print/export feature on checkout history page This patch adds columns configuration and export features to the checkout history page. This patch also removes some inline CSS: "overflow:hidden" from both the checkout and holds history pages. This was breaking the table controls tooltips, and didn't appear to me to be necessary. To test, apply the patch and restart Plack (or restart_all on kohadevbox). - Open a patron's checkout history page in the staff client. - The table of checkouts should have controls at the top. for columns configuration and export/print. - These controls should work correctly. Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	5 years ago
Owen Leonard	6c7c97f67c	Bug 22015: Move DataTables CSS to global include DataTables are used on enough pages in the staff client that it doesn't make sense to put inclusion of the CSS into each template where it is needed. This patch moves includes of datatables.css from individual templates into the global header file. To test, apply the patch and view various pages which have DataTables. View various styles of DataTables, e.g. - Full pagination, like item search results - Four-button, like Saved SQL reports Everything should look the same as it was. Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Owen Leonard	f75897a972	Bug 21963: Update two-column templates with Bootstrap grid: Patrons part 1 This patch modifies several patron templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Patrons -> View patron - Fines - Account - Create manual credit - Delete - Try to delete a patron with checkouts - Discharges - Housebound - Files - Holds history Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 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
Jonathan Druart	eac802b712	Bug 20806: Surround string by span tag to help translation Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	2a369663fd	Bug 20806: Do not rely on column position It is not the first time we have this splice call, it seems safer to rely on the column's name instead of the column's position Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Josef Moravec	0c1490ec71	Bug 20806: Add item type description holds history page Test plan: 0) Do not apply the patch 1) Set AllowHoldItemTypeSelection to Allow 2) Place some hold for a patron, some with specific item type and some without item type 3) On holds history page you should see blank or item type code in item type column 4) Apply the patch 5) Now you should see description in item type column 6) Set AllowHoldItemTypeSelection to Don't Allow 7) You shold not see the item type column, but column visibility settings should continue working ;) Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Followed the test plan and it works. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Josef Moravec	9bd9d28874	Bug 20831: Fix KohaTable calls after bug 9573 Test plan: 0) Do not apply the patch 1) Confirm not working datatable on patrons hold history page 2) Apply the patch 3) The table should be working now Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Julian Maurice	ed7543287b	Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new <script> or <link> - It prevents grep'ing for the full filename - It violates the DRY principle - If at some point we want to change the "force js and css reload" mechanism, it will be tedious This patch: - adds a Template::Toolkit plugin that generates <script> and <link> tags for JS and CSS files, and inserts automatically the Koha version in the filename - use the new plugin to remove all occurences of [% KOHA_VERSION %] - remove the code that was adding KOHA_VERSION as a template variable Test plan: 1. Apply patch 2. Go to several different pages in Koha (opac and intranet) while checking your browser's dev tools (there should be no 404 for JS and CSS files, and the Koha version should appear in filenames) and the server logs (there should be no "File not found") 3. `git grep KOHA_VERSION` should return nothing 4. prove t/db_dependent/Koha/Template/Plugin/Asset.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Owen Leonard	047ca33a93	Bug 19641: Move patron templates to the footer This patch modifies the staff client patron module templates so that JavaScript is included in the footer instead of the header. This patch touches a lot of files because the changes are all interdependent, affecting a couple of module-wide include files. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. Patrons -> Patrons home, patron search results -> Manage pending modification requests -> Patron detail page -> Edit patron -> Set guarantor -> Fines -> Account, Pay fines, Create manual invoice, Create manual credit -> Print receipts for different kinds of charges -> Routing lists -> Circulation history -> Holds history -> Notices -> Statistics -> Files -> Purchase suggestions -> Discharges -> Housebound -> Set permissions -> Change password -> Print summary, slips, and overdues -> Update child to adult patron type Patron toolbar and patron search bar operations should work correctly on all pages. This patch also updates the template for searching the Norwegian national patron database, but it has NOT been tested. Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Zoe Bennett <zoebennett1308@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Jonathan Druart	0ad922011c	Bug 12904: Force browser to load new javascript files after upgrade This patch has been automatically generated using: perl kv.pl */.tt */.inc Signed-off-by: Josef Moravec <josef.moravec@gmail.com>	6 years ago
Josef Moravec	ebd7c422b4	Bug 19456: Make patron-title ability to be generated with or without html tags Modified pages: circ/circulation.pl circ/circulation_batch_checkouts.pl members/boraccount.pl members/files.pl members/holdshistory.pl members/housebound.pl members/moremember.pl members/notices.pl members/purchase-suggestions.pl members/readingrec.pl members/routing-lists.pl members/statistics.pl Test plan: 0) Do not apply the patch 1) Have a patron with title/salution filled in 2) Confirm bug, go for example to circ/circulation page and see there is html in <title> tag (you can see it in your browser page/window title) 3) Apply the patch 4) Go through circulation/patron pages (see modified page above) and confirm there is no html in <title> tag, but on the page itself the salutation should be in <span class="patron-title"> Signed-off-by: David Bourgalt <david.bourgault@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Jonathan Druart	9daf668ca3	Bug 14919: Remove notificationdate and reminderdate These columns are not used, we do not need to display them Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Katrin Fischer	f20a694f13	Bug 14919: (follow-up) Changed status from 'in queue' to 'pending' Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Josef Moravec	1ac5044300	Bug 14919: (followup) Show accurate status in holds history This patch fixes the status showed in holds history table. The determination of status is following: 1. "hold.found is 'F'" - Fullfilled - the hold was fullfilled by checking the item to patron. If hold reaches this state, it can't changed status anymore, or be cancelled, that's why this goes first 2. "hold.cancellationdate is filled" - When the hold is cancelled, its eventually waiting or in transit status remains the same, only cancellation dat is filled, so this has to go second 3. "hold.found is 'W'" - Hold is waiting 4. "hold.found is 'T'" - Hold is in transit to target library Test plan: 0) Apply the patch 2) Read the status determination note in this commit message and confirm it makes sense 1) Have patron/patrons with at least one hold in every status 2) Go to holds history page and confirm it show the right status 3) Try to break the status determination ;) Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Katrin Fischer	7dcd30d1d8	Bug 14919: (follow-up) Fixing some typos and adding to pref description - Adds 'holds' to pref description of intranetreadinghistory - Fixes typo in link to holds history from patron account - Changes reserve date to hold date in table heading Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Josef Moravec	4fa34acc41	Bug 14919: Add holds history for patron Test plan: 0) Have a patron with some current and old reserves 1) Go to patron circulation page 2) Notice, there is new item called "Holds history" in the left circulation menu 3) Go to this page and confirm the data on this page are OK, and that ui does behave as expected 4) Go to adminitration, columns setting, try to change the setting for holdshistory table and confirm it is taken into account on holds history page Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago

23 Commits (d3f3a55e0b1544ebcd3166d141e126a4324baab1)