U odpisů udělat kontrolu aby se již odepsaná kniha neodepsala znovu #4

xmorave2 · 2016-07-29T17:04:22Z

No description provided.

This patch replaces the hardcoded protocol ("http") from the URI with https since that is what Google defacto uses to serve JS resources Prevents MIXED CONTENT failure, allowing GoogleIndicTransliteration to function correctly when used in SSLized OPACs. Test plan --------- 1/ Make sure your OPAC is being served both over HTTP and HTTPS 2/ Set GoogleIndicTransliteration syspref to "Show" 3/ Access the OPAC over http, Google transliteration element will show up in masthead searchbox. 4/ Access the OPAC over https. The element will not show. Console will show MIXED CONTENT error and failure of google loader. 5/ Apply patch. Repeat steps #3 and #4 again. Now in both cases GoogleIndicTransliteration will work. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> (cherry picked from commit 6fcd32a) Signed-off-by: Frédéric Demians <[email protected]>

This patch replaces the hardcoded protocol ("http") from the URI with https since that is what Google defacto uses to serve JS resources Prevents MIXED CONTENT failure, allowing GoogleIndicTransliteration to function correctly when used in SSLized OPACs. Test plan --------- 1/ Make sure your OPAC is being served both over HTTP and HTTPS 2/ Set GoogleIndicTransliteration syspref to "Show" 3/ Access the OPAC over http, Google transliteration element will show up in masthead searchbox. 4/ Access the OPAC over https. The element will not show. Console will show MIXED CONTENT error and failure of google loader. 5/ Apply patch. Repeat steps #3 and #4 again. Now in both cases GoogleIndicTransliteration will work. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> (cherry picked from commit 6fcd32a) Signed-off-by: Frédéric Demians <[email protected]> (cherry picked from commit 3a5e208) Signed-off-by: Julian Maurice <[email protected]>

This patch replaces the hardcoded protocol ("http") from the URI with https since that is what Google defacto uses to serve JS resources Prevents MIXED CONTENT failure, allowing GoogleIndicTransliteration to function correctly when used in SSLized OPACs. Test plan --------- 1/ Make sure your OPAC is being served both over HTTP and HTTPS 2/ Set GoogleIndicTransliteration syspref to "Show" 3/ Access the OPAC over http, Google transliteration element will show up in masthead searchbox. 4/ Access the OPAC over https. The element will not show. Console will show MIXED CONTENT error and failure of google loader. 5/ Apply patch. Repeat steps #3 and #4 again. Now in both cases GoogleIndicTransliteration will work. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Kyle M Hall <[email protected]>

…o mistakes The button to cancel a club enrollement is labelled with 'Cancel'. That is ambiguous and translates e.g. in German to 'Abbrechen' which can lead to mistakes. To test: - Apply patch - Enroll a patron to a club - Enable public enrollment in OPAC - Verify that the button to cancel enrollment in both OPAC and staff client reads 'Cancel enrollement' (instead of 'Cancel' without patch) (The button appears on the patron's detail pages in OPAC and staff client) Amended for comment #4 / mv Signed-off-by: Josef Moravec <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> Signed-off-by: Jonathan Druart <[email protected]> (cherry picked from commit 628d839) Signed-off-by: Fridolin Somers <[email protected]>

…o mistakes The button to cancel a club enrollement is labelled with 'Cancel'. That is ambiguous and translates e.g. in German to 'Abbrechen' which can lead to mistakes. To test: - Apply patch - Enroll a patron to a club - Enable public enrollment in OPAC - Verify that the button to cancel enrollment in both OPAC and staff client reads 'Cancel enrollement' (instead of 'Cancel' without patch) (The button appears on the patron's detail pages in OPAC and staff client) Amended for comment #4 / mv Signed-off-by: Josef Moravec <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> Signed-off-by: Jonathan Druart <[email protected]>

File add koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt exposes parts of template directives due to html tags inide directives. Fix it using the HtmlTags filter. To verify: - Create a translation for a language 'aa-AA - po file aa-AA-staff-prog.po / translate.koha-community.org for 17.05 contains a line '%%]'%sCurrencies %s To test: - Apply patch on top of Bug 18665 - Recreate translation - Verify that line above is gone - Verify that in staff client currencies administration wors as before Followed test plan and it worked as intended Signed-off-by: Alex Buckley <[email protected]> Signed-off-by: Brendan A Gallagher <[email protected]> Bug 18684: (followup) Move 2 closing h3 tags to end of previous lines See comment #4 Signed-off-by: Jonathan Druart <[email protected]>

See end of comment #4 and IRC: http://irc.koha-community.org/koha/2017-08-03#i_1958062 Signed-off-by: Lee Jamison <[email protected]> Signed-off-by: Josef Moravec <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Marcel de Rooy <[email protected]> Signed-off-by: Jonathan Druart <[email protected]>

In the regular situation, you can get itemtype via biblio and then biblioitem as well as via biblioitem (at least when item-level_itypes is set to biblio). But since Koha unfortunately defined two relations in item, one for biblioitemnumber (the good one) and one for biblionumber (redundant), TestBuilder (correctly) builds one biblioitem and two biblios. If you item-level_itypes to biblio record, this will result in failing tests when calling AddReturn (in this case Koha/Patrons.t). It will crash on: Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826. Cause: AddReturn goes via the biblionumber to biblio and than to biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder but a database design problem.) This patch makes a small change in AddReturn to retrieve the itemtype via biblioitem. It actually is a shorter road than items->biblio->biblioitems. Note: I do not test the Biblioitems->find call, since we already checked the GetItem call before and we have a foreign key constraint. I did not call $item->effective_itemtype since we still use GetItem; this could be done later. Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and we called AddBiblio before, we should link biblioitemnumber as well. Test plan: [1] Do not apply this patch yet. [2] Set item-level_itypes to biblio record. [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.) [4] Apply this patch. [5] Run t/db_dependent/Koha/Patrons.t again. [6] Run t/db_dependent/Circulation/Returns.t [7] Git grep on AddReturn and run a few other tests calling it. Note: Bugs 19070/19071 address three tests that call AddReturn too. [8] In the interface, check in a book. Signed-off-by: Marcel de Rooy <[email protected]> Note: Bugs 19070 and 19071 are already pushed. The command in comment #4 has all the tests successful. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> Signed-off-by: Jonathan Druart <[email protected]>

See end of comment #4 and IRC: http://irc.koha-community.org/koha/2017-08-03#i_1958062 Signed-off-by: Lee Jamison <[email protected]> Signed-off-by: Josef Moravec <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Marcel de Rooy <[email protected]> Signed-off-by: Jonathan Druart <[email protected]> (cherry picked from commit a10e538) Signed-off-by: Fridolin Somers <[email protected]> (cherry picked from commit c4e608d) Signed-off-by: Katrin Fischer <[email protected]>

See end of comment #4 and IRC: http://irc.koha-community.org/koha/2017-08-03#i_1958062 Signed-off-by: Lee Jamison <[email protected]> Signed-off-by: Josef Moravec <[email protected]> Signed-off-by: Katrin Fischer <[email protected]> Signed-off-by: Marcel de Rooy <[email protected]> Signed-off-by: Jonathan Druart <[email protected]> (cherry picked from commit a10e538) Signed-off-by: Fridolin Somers <[email protected]>

In the regular situation, you can get itemtype via biblio and then biblioitem as well as via biblioitem (at least when item-level_itypes is set to biblio). But since Koha unfortunately defined two relations in item, one for biblioitemnumber (the good one) and one for biblionumber (redundant), TestBuilder (correctly) builds one biblioitem and two biblios. If you item-level_itypes to biblio record, this will result in failing tests when calling AddReturn (in this case Koha/Patrons.t). It will crash on: Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826. Cause: AddReturn goes via the biblionumber to biblio and than to biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder but a database design problem.) This patch makes a small change in AddReturn to retrieve the itemtype via biblioitem. It actually is a shorter road than items->biblio->biblioitems. Note: I do not test the Biblioitems->find call, since we already checked the GetItem call before and we have a foreign key constraint. I did not call $item->effective_itemtype since we still use GetItem; this could be done later. Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and we called AddBiblio before, we should link biblioitemnumber as well. Test plan: [1] Do not apply this patch yet. [2] Set item-level_itypes to biblio record. [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.) [4] Apply this patch. [5] Run t/db_dependent/Koha/Patrons.t again. [6] Run t/db_dependent/Circulation/Returns.t [7] Git grep on AddReturn and run a few other tests calling it. Note: Bugs 19070/19071 address three tests that call AddReturn too. [8] In the interface, check in a book. Signed-off-by: Marcel de Rooy <[email protected]> Note: Bugs 19070 and 19071 are already pushed. The command in comment #4 has all the tests successful. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> Signed-off-by: Jonathan Druart <[email protected]> (cherry picked from commit 0fc3f19) (cherry picked from commit fba3295) Signed-off-by: Katrin Fischer <[email protected]>

In the regular situation, you can get itemtype via biblio and then biblioitem as well as via biblioitem (at least when item-level_itypes is set to biblio). But since Koha unfortunately defined two relations in item, one for biblioitemnumber (the good one) and one for biblionumber (redundant), TestBuilder (correctly) builds one biblioitem and two biblios. If you item-level_itypes to biblio record, this will result in failing tests when calling AddReturn (in this case Koha/Patrons.t). It will crash on: Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826. Cause: AddReturn goes via the biblionumber to biblio and than to biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder but a database design problem.) This patch makes a small change in AddReturn to retrieve the itemtype via biblioitem. It actually is a shorter road than items->biblio->biblioitems. Note: I do not test the Biblioitems->find call, since we already checked the GetItem call before and we have a foreign key constraint. I did not call $item->effective_itemtype since we still use GetItem; this could be done later. Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and we called AddBiblio before, we should link biblioitemnumber as well. Test plan: [1] Do not apply this patch yet. [2] Set item-level_itypes to biblio record. [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.) [4] Apply this patch. [5] Run t/db_dependent/Koha/Patrons.t again. [6] Run t/db_dependent/Circulation/Returns.t [7] Git grep on AddReturn and run a few other tests calling it. Note: Bugs 19070/19071 address three tests that call AddReturn too. [8] In the interface, check in a book. Signed-off-by: Marcel de Rooy <[email protected]> Note: Bugs 19070 and 19071 are already pushed. The command in comment #4 has all the tests successful. Signed-off-by: Mark Tompsett <[email protected]> Signed-off-by: Kyle M Hall <[email protected]> Signed-off-by: Jonathan Druart <[email protected]> (cherry picked from commit 0fc3f19)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

U odpisů udělat kontrolu aby se již odepsaná kniha neodepsala znovu #4

U odpisů udělat kontrolu aby se již odepsaná kniha neodepsala znovu #4

xmorave2 commented Jul 29, 2016

U odpisů udělat kontrolu aby se již odepsaná kniha neodepsala znovu #4

U odpisů udělat kontrolu aby se již odepsaná kniha neodepsala znovu #4

Comments

xmorave2 commented Jul 29, 2016