[koha-commits] main Koha release repository branch master updated. v3.14.00-715-g9132f9b
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 11 18:04:05 CEST 2014
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, master has been updated
via 9132f9befb36f32fc35a511c3829c224b42893bf (commit)
via 9834401c59ed2ac41ca354732a528a117404fb76 (commit)
via 64e9ee3141005a5cbddaff19235727d0b4a25c06 (commit)
via 4d58383ede02779d261ef11b1b4da782221caaad (commit)
via f4633cc5e51e8859f93be397eaee1370afc54099 (commit)
via 0f6652d62bd9053c87de5b94eb6a35f68a3af4bf (commit)
via f71283bad5517757ee6b670c0edb5257d0a1bedc (commit)
via ae030272a4f30104adefe9d6164eb99a0f4d8f73 (commit)
via 62151ced35329f94e4508b4973521464d48307c9 (commit)
via a4841aae08cf60b4fcf628eee991738e2232cc80 (commit)
via 6372689f5dc7f0e9d34ffef3ad0c2a1ab6d6fb58 (commit)
via ffeb666994327b97e26bc372fd574d05a40e8336 (commit)
via eab5480614edf9cc5895bc076d4e31dc77c1fe40 (commit)
via 35142704d0a9831b6d4560cdf98a1bc9481414e9 (commit)
via 377dbfc73fb2a06b8a0d50731e2c8ba14968d68e (commit)
via 0ea17a6a7689e7fb3d60ebb72cac72eefb142d8a (commit)
from c38cf38c973159af2d03c6956d7aede8aebb20d5 (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 9132f9befb36f32fc35a511c3829c224b42893bf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 19 16:38:20 2014 +0100
Bug 11960: replace unnecessary call of GetMemberDetails by CanBookBeRenewed
C4::Circulation::CanBookBeRenewed called C4::Members::GetMemberDetails to
retrieve categorycode and branchcode.
- categorycode is used to retrieve the issuing rule
- the borrower information is passed to
C4::Circulation::_GetCircControlBranch. Which only uses the branchcode
parameter.
GetMemberDetails does a lot of calls/queries (patronflags,
account, etc.) that are not needed by CanBookBeRenewed.
This patch replaces it with a call to C4::Members::GetMember.
Note: I presented this small optimisation during a quick introduction to
NYTProf (hackfest 14 in Marseille).
Test plan:
- launch member unit tests
- check the code
Checking the code resulted in the following:
CanBookBeRenewed builds a hash reference from the borrowernumber
(2482). Note it is only used in this function and not passed in.
_GetCircControlBranch (2485) requires that hashreference to
have a branchcode key. As stated above.
The following line (2486) requires it have a categorycode key.
As such, C4::Members::GetMemberDetails is confirmed to be
overkill, and C4::Members::GetMember is sufficient.
Testing Done
------------
0) Back up DB
1) Make sure MPL is in the list of libraries.
2) Apply the patch.
3) run the koha qa test tool
4) prove -v t/db_dependent/Circulation.t
Patch applies cleanly. QA Test tool was all OK. All tests ran successfully.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9834401c59ed2ac41ca354732a528a117404fb76
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Apr 11 16:21:14 2014 +0000
Bug 11598: (follow-up) improve help text for --html and --text options
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 64e9ee3141005a5cbddaff19235727d0b4a25c06
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 22 09:50:16 2014 -0500
Bug 11598: Add --text option to overdue_notices similar to --html option
We have a number of reports of libraries that were upset by Bug 10720
being fixed! These libraries preferred this single file output, but as
text only. We should bring back this behavior, but as a feature, not a
bug.
Test Plan:
1) Apply this patch
2) Run overdue_notices.pl --html
3) Note the output is wrapped in html tags
4) Run overdue_notices.pl --text
5) Note the same output, but not wrapped in html tags
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
To test, add the -n parameter.
The filename generation could be refactored but not blocker.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 4d58383ede02779d261ef11b1b4da782221caaad
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date: Mon Apr 7 11:55:35 2014 -0400
Bug 12040: Add 3 parameters to runreport.pl for SMTP authentication
This patch adds three optional parameters to runreport.pl
to allow authentication with the SMTP server.
--username -> Username to pass to the SMTP server for
authentication
--password -> Password to pass to the SMTP server for
authentication
--method -> Method is the type of authentication.
Ie. LOGIN, DIGEST-MD5, etc.
Test Plan
---------
As for testing manually using a Gmail account:
1. Set up your sendmail as shown in
misc/cronjobs/CONFIGURE.gmail
2. Before applying this patch, run misc/cronjobs/runreports.pl
on your favorite report including the proper email parameters
against your gmail account.
3. Note the failure message stating the authentication
requirement.
4. Apply this patch, and return the script including the
additional parameters and specifying "LOGIN" for the method.
5. Note the successful send.
6. perldoc misc/cronjobs/runreport.pl
7. Run the koha qa test tool.
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f4633cc5e51e8859f93be397eaee1370afc54099
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Apr 11 15:25:41 2014 +0000
Bug 11441: (follow-up) improve utility help text
This patch expands and reformats the help text displayed
when running remove_unused_authorities.pl -h.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0f6652d62bd9053c87de5b94eb6a35f68a3af4bf
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date: Tue Jan 21 12:46:09 2014 +0100
Bug 11441: enhance remove_unused_authorities.pl ability to select records
remove_unused_authorities.pl previously required that --aut be supplied
to specify one or more authority types to check for unlinked authority
records. If --aut was omitted, it would default to search for
records of authority type NC, which is not present in many (or any?)
Koha databases.
Now, if --aut is omitted, unlinked authority records of any type
are removed.
To test it:
Parse only PERSO_NAME authorities:
misc/migration_tools/remove_unused_authorities.pl -aut PERSO_NAME
Parse all authorities:
misc/migration_tools/remove_unused_authorities.pl
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f71283bad5517757ee6b670c0edb5257d0a1bedc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Mar 24 15:25:05 2014 +0100
Bug 11995: restore ability of serialsUpdate.pl to calculate next serial issue dates
Bug 7688 changed the prototype for GetNextDate, but the serialsUpdate.pl
cronjob script had not been updated. This patch fixes the problem.
Test plan:
Before applying the patch:
1/ Check that the following SQL query returns something:
SELECT serial.*
FROM serial
LEFT JOIN subscription ON (subscription.subscriptionid = serial.subscriptionid)
WHERE serial.status = 1
AND DATE_ADD(planneddate, INTERVAL CAST(graceperiod AS SIGNED) DAY) < NOW()
AND subscription.closed = 0;
2/ Run misc/cronjobs/serialsUpdate.pl -v
It should die with an error message like this:
Can't use string ("2011-03-05") as a HASH ref while "strict refs" in use
3/ Apply the patch
4/ Run misc/cronjobs/serialsUpdate.pl -v
It should exit normally and print messages like this:
Serial issue with id=XX updated
5/ Run the Koha QA test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ae030272a4f30104adefe9d6164eb99a0f4d8f73
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:16:21 2014 +0100
Bug 7267: Add account number to German PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pagesde
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 62151ced35329f94e4508b4973521464d48307c9
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:13:33 2014 +0100
Bug 7267: Add account number to English PDF templates
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pages
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
- Repeat with pdfformat::layout3pages
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a4841aae08cf60b4fcf628eee991738e2232cc80
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:17:44 2014 +0100
Bug 7267: Add account number to French PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout3pagesfr
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6372689f5dc7f0e9d34ffef3ad0c2a1ab6d6fb58
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Mar 1 09:33:27 2014 +0100
Bug 11828: (follow-up) add new option to OrderPdfFormat
To test:
- Check appearance of the OrderPdfFormat system preference
It will offer a pull down with options, including
"German 2-page"
Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ffeb666994327b97e26bc372fd574d05a40e8336
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Wed Feb 26 17:50:10 2014 +0100
Bug 11828: Add German translation of layout2pages PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pagesde
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check everything is translated into German and the formatting/layout
looks ok
Followed test plan and compared English with German printout.
German version is OK.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit eab5480614edf9cc5895bc076d4e31dc77c1fe40
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 11 10:32:37 2014 +0200
Bug 11885: (follow-up) add a CSS class to set subfield code bold
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 35142704d0a9831b6d4560cdf98a1bc9481414e9
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Wed Apr 9 08:43:23 2014 -0300
Bug 11885: (follow-up) remove tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 377dbfc73fb2a06b8a0d50731e2c8ba14968d68e
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 2 20:22:44 2014 -0400
Bug 11885: (follow-up) make default styling consistent with previous look
Jonathan Druart raised the following three issues:
1/ subtags was bold before patch
2/ 1 dash existed between tag and tag name
3/ A space has been added ("606 #1 - Sujet nom commun"
becomes "606 # 1 Sujet nom commun", "101 ## - Langue"
becomes "101 # # Langue")
This patch addresses them in the following way:
1/ You will note that @ was not bold on the 0 tab.
Every other tab were bold. By making the similar template
into a procedure based on the 0XX tab, bolding was lost.
This patch bolds all subtags including the @, so that
the visible change is minimized.
2/ The dash was programmatically added in at the code stage
previously. This bug fix splits the the single concatenation
mess into parts which can be styled. This puts the dash back
into the template. However, it should be noted that the
spacing for the 0 tab's tag and tag description will have an
extra space after the hypen that was lacking before.
3/ <span>...</span><span>...</span> is different than
<span>...</span>
<span>...</span>
The later puts that extra space. This patch fixes that.
See comment 1 for the test plan.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described.
Small koha-qa errors fixed in followup
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0ea17a6a7689e7fb3d60ebb72cac72eefb142d8a
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Tue Mar 4 08:57:11 2014 +0200
Bug 11885: fix inconsistent HTML in MARC Details
In Catalog > MARC Details, the HTML in the different tabs is slightly
inconsistent and doesn't differentiate different elements, making CSS
styling complicated or impossible:
* tab 0 has <p class="subfield_line"> whereas all the other tabs
have just <p>
* all other tabs wrap the subfield character in <b> tags, except
for tab 0
* the MARC tag title is a single div with the tag, the indicators
and the field description.
Attached patch folds all the tab outputs into a single TT BLOCK,
which is then reused. It also marks the separate parts of the tag
title in their own spans.
The output should be nearly identical to previous behaviour, minus
a dash from the tag title descriptions - it was used to separate
the tag from the description. The description can now be styled
separately from the tag itself, so the dash can be added with CSS,
if necessary.
Revised test:
1) Find a biblio
2) Edit the record so that there is something in every tab (0-9).
3) Save and then click 'MARC' in the left pane to view the
MARC details.
4) Note the contents of each tab.
5) Apply patch
6) Compare the MARC details output to what was noted. Should
be the same, minus a dash in each of the tag title descriptions.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 2 +-
acqui/basketgroup.pl | 3 +-
acqui/pdfformat/layout2pages.pm | 2 +
.../{layout2pages.pm => layout2pagesde.pm} | 12 +-
acqui/pdfformat/layout3pages.pm | 2 +
acqui/pdfformat/layout3pagesfr.pm | 2 +
catalogue/MARCdetail.pl | 12 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 4 +
.../en/modules/admin/preferences/acquisitions.pref | 1 +
.../prog/en/modules/catalogue/MARCdetail.tt | 338 +++-----------------
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt | Bin 12688 -> 12728 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf | Bin 25541 -> 25887 bytes
.../intranet-tmpl/prog/pdf/layout2pagesde.odt | Bin 0 -> 12859 bytes
.../intranet-tmpl/prog/pdf/layout2pagesde.pdf | Bin 0 -> 23822 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt | Bin 12973 -> 13023 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf | Bin 26944 -> 27293 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.odt | Bin 13284 -> 12854 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.pdf | Bin 24394 -> 24401 bytes
misc/cronjobs/overdue_notices.pl | 66 ++--
misc/cronjobs/runreport.pl | 55 +++-
misc/cronjobs/serialsUpdate.pl | 6 +-
misc/migration_tools/remove_unused_authorities.pl | 24 +-
22 files changed, 177 insertions(+), 352 deletions(-)
copy acqui/pdfformat/{layout2pages.pm => layout2pagesde.pm} (94%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.odt
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.pdf
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list