[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-57-g3714af3
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 18 11:05:13 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.8.x has been updated
via 3714af3015f24ebfcd25b9742fe73831ba23a796 (commit)
via 1e18e87b3602bea961aa15203c18d2dfafd89097 (commit)
via be2db1c1e3afd88edd42aa3facff63477beb4f25 (commit)
via 0318f1ea9c02c8e3df01f10cb1a7e5c7cb46f989 (commit)
via 43ae4ba70922f017de1a489d1911a23b30c75b5d (commit)
via 55bb257cae30d096f32209648a65e65f9a6a400a (commit)
via 5260c7fe3bb2b50188a6c8bc4ed49a6eb45356ba (commit)
via 69c824eb7c2d69b23c4e03dcc1f518980c5a7071 (commit)
via 9618b6a0fd526a4de99eaa5a991b9dade3487f01 (commit)
from d7a6135a39c5f41b47c1ae35e54ce0a26ef12daa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3714af3015f24ebfcd25b9742fe73831ba23a796
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Feb 19 11:41:59 2013 -0500
Bug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE
When clicking the login link for opac-user.pl in a multiple branch
scenario the environment variable for OPAC_CSS_OVERRIDE was ignored from
the koha-conf.xml file. It seems like is is working on every page in
the opac except for the login page.
Test Plan:
1) Set up a Koha server with 2 separate catalog configurations
( e.g. opac1.kohatest, opac2.kohatest )
2) Set the OPAC_CSS_OVERRIDE directive for separate css files
in each opac
3) Browse to the opac login page, note the css is not applied
4) Apply this patch
5) Reload the page, note the css is now applied
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 71b79d59908cd85130afd8600eff0f93fc79b8a9)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)
Solved Conflicts in C4/Auth.pm
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit b9687ad6a6f638bc25fb2cad12fa5da73c10e714)
commit 1e18e87b3602bea961aa15203c18d2dfafd89097
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jun 10 14:05:32 2013 +0200
Bug 10439: fix bug preventing the library for a notice from being changed
2 javascript functions should be apply only in a specific case, not for all
views.
Test plan:
- Switch on the IndependentBranches pref and log
in as a superlibrarian.
- Try to change the library for a notice. Before the patch,
no change is applied.
- Try to create a new notice, changing the library from
default in the process. Before the patch, the notice
is not created.
The bug can also be reproduced when IndependentBranches is
off, in which case the staff user need not be a superlibrarian.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 77a5e3e365a50b02c9f224d731e05de90fc667c9)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Test plan works as advertised.
(cherry picked from commit a2e89edf43b2946da0986a5c83b04a60dea04061)
Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a2e89edf43b2946da0986a5c83b04a60dea04061)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit d2a284da136cdf72cb201d0efd049507f66393e7)
commit be2db1c1e3afd88edd42aa3facff63477beb4f25
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jun 13 14:20:43 2013 -0300
Bug 10464: Patron search on placing a hold now supports autocomplete
The patron search box for placing a hold request on a bib in the
staff interface now supports autocomplete if the CircAutocompl
system preference is enabled.
This patch grabs the autocomplete handling javascript stuff from patron-search-box.inc
and puts an adjusted version on reserve/request.tt. It sets form and input
IDs to match those configured in the autocomplete call, adjusted where needed to
avoid name collisions with the patron-search-box.inc that is present everywhere.
This patch also doubles the width of the patron search input field.
To test:
- On a biblio record, go to the Holds tab, mine looks like
/cgi-bin/koha/reserve/request.pl?biblionumber=2
- A search box is shown for patron searching.
- Search for a patron: it works as usual.
- Make sure CircAutocompl is "Don't try"
- Apply the patch
- Click the Holds tab again, and do the same search: functionality should remain intact.
- Change CircAutocompl to "Try"
- Click the Holds tab again
- Autocomplete should show you the possible options, and once you choose one result,
it should work as usual.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Adding a nice new autocomplete feature.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit dc94a9bef79dc6d186fe93d82dac10cab0468d24)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit dd574b1b705b545eba115371d37ac4545ad0bdf3)
commit 0318f1ea9c02c8e3df01f10cb1a7e5c7cb46f989
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu May 30 18:23:55 2013 +0100
Bug 766: remove CGI::scrolling_list from request.pl
Let the template take care of generating the display.
Lets at least part of request.pl be more succinct.
To test, place a hold and search for the patron using a partial name.
You should get a dropdown select list of patrons and be able to select
the patron to hold for from there.
The functionality should remain unimpaired after this patch is applied.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7668e19c9593da570cffb5cd4640fe175d739328)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit ccbc3226646c3c3b68b2ecffc84689a0f66a7ace)
commit 43ae4ba70922f017de1a489d1911a23b30c75b5d
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Jun 14 13:03:19 2013 +1000
Bug 10466: fix glitch in OPAC display of titles saved to list
When displaying (in the OPAC) the set of records saved to a list,
an apparently random number (typically 33 or 34) is sometimes
displayed at the end of the publication description. In particular,
this can occur when XSLT is *not* being used to display search results;
this patch corrects the problem.
Now for the technical details:
This patch checks to see if "size" is undefined. If it is, we add a
blank (i.e. "") value to it in place of undef.
If we do not do this, calling "itemloo.size" will return the size
of the "itemloo" hash, rather than the value for the "size" key.
This is because "size" is a virtual method in Template Toolkit. It's
uncertain why the value is retrieved for the "size" key when there is
a defined value and why TT doesn't use the method instead, and that
it uses "size" as a method only if there is either no "size" key or
if the value tied to the "size" key is null/undef. This might be a
feature or it might be a bug in TT...
In the meantime, we will check to see if it's undefined. If it is,
we'll give it a value.
This bug has been identified in the opac-search.pl, search.pl and
addbooks.pl pages before. To address it, we're currently checking
if there is a "size" key, and if not...we're adding one with a blank
value.
This patch takes up that same idea, although I think it might be better
to rename the variable before passing it to TT in case the behaviour
of TT changes in the future in regards to how it handles virtual
methods.
N.B. Obviously, this only affects users not using XSLTs.
--
Test Plan:
Before applying the patch:
0) Make sure you have opac search result XSLT turned off
1) Find bib records that do not have a 300$c (Dimensions) value.
2) Find bib records that do have a 300$c (Dimensions) value.
(N.B. These values should be stored in the `size` column of biblioitems).
3) Add items from both sets of records to a List
4) Note that records without a 300$c will display a number at the end
of the "Publication" description/string. It should be something like
33 or 34 in most cases.
5) Note that records with a 300$c don't display this number. They just
show the value from 300$c.
Apply the patch.
6) Clear your cache, refresh the page, etc.
7) Note that the number (e.g. 33 or 34) has disappeared from the end
of the "Publication" description/string.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Added a small comment at the end of this one line.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ceada35e008e6a60b62f384ec386e80b03fe0130)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit 0cb17b47f67f1d91221841e70f8430bdca5642a8)
commit 55bb257cae30d096f32209648a65e65f9a6a400a
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Tue Jul 16 02:06:40 2013 +1200
Bug 10590 - parameterise the limit option
The limit option was previously substituted directly into the query. The
previous patch on bug 10590 filters it on input, but there's no reason
not to have it made to work properly in the query for added safety.
To test:
[1] Go to the top checkouts report (http://OPAC/cgi-bin/koha/opac-topissues.pl)
[2] Run the report several times, varying the filters on
number of results and item type.
[3] Verify the the list of top checkouts appears to be correct.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 89cf013a6fadcb1347151798f3fdab0d8c75cd15)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit f5ee81028dda33027daf3c921b38bf06218f9dfa)
commit 5260c7fe3bb2b50188a6c8bc4ed49a6eb45356ba
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Mon Jul 15 13:00:18 2013 +0200
Bug 10590 - in opac-topissues limit param is not protected
In opac-topissues page, the limit URL argument is directly added to SQL query.
This patch adds protections : limit must only contain digits and must be lower than 100.
Test plan :
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=10&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=9999&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 100 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=WHERE&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 57866d6b67c3f8b29290150f21c71395315a73fe)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit c0cb1f8b0e8aa53707447ee7c27fd15fc0a7b80c)
commit 69c824eb7c2d69b23c4e03dcc1f518980c5a7071
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Jun 14 08:30:35 2013 -0700
Bug 10425: tweaks to text of help for local use system preference
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit 4339d827792c7063066e873b2280b39d70e8f590)
commit 9618b6a0fd526a4de99eaa5a991b9dade3487f01
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jun 6 10:57:29 2013 +0200
Bug 10425 - Help page missing for Local Use preferences
When viewing Local Use system preferences tab, the help button will lead to an error page.
This is because Local Use tab uses not the same script has other tabs : systempreferences.pl.
This patch adds help/systemprefences.tt
Test plan :
- Go to Local Use preferences : /cgi-bin/koha/admin/systempreferences.pl
- Click on Help link (at right top)
- See you get the same page as other preferences tab help
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0e0a1a61a62473de7ae92bde9d0f3617c34ba325)
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Chris Hall <followingthepath at gmail.com>
(cherry picked from commit ccc0691f7f1fd4dfc8e98c30ffc5117508aaed43)
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 3 +-
C4/VirtualShelves/Page.pm | 1 +
.../en/modules/help/admin/systempreferences.tt | 13 +++++
.../prog/en/modules/reserve/request.tt | 54 ++++++++++++++++----
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +
opac/opac-topissues.pl | 10 ++--
reserve/request.pl | 46 ++++-------------
7 files changed, 78 insertions(+), 51 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list