Ian Walls [Fri, 9 Sep 2011 15:17:19 +0000 (11:17 -0400)]
Bug 6862: Duplicate VOKAL Book icons
Removes duplicate VOKAL icons for Book.png and Book-32px.png. Database updated in both
itemtypes and authorised_values tables to reflect change, so no icon loss should be seen
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 29 Sep 2011 05:05:49 +0000 (18:05 +1300)]
Bug 6938 - replace two subscription fields that were incorrectly removed
The "Note for OPAC" and "Note for staff" fields in subscriptions were
removed, but they are their own fields in the database and display in
other places too. This patch puts them back so that they can once again
be edited.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2f11d527a0749e86350d62055f289aaee9435848)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 518710878972a72b8d7b306af571b7c543267ddd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 2 Sep 2011 16:39:53 +0000 (18:39 +0200)]
Bug 6840 warning in logs
In staff interface, in search (catalogue/search.pl), there is a warning saying:
[Fri Sep 2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.
The problem happens when searching from the quick search toolbar, not when you
search from advanced search.
Investigating, it seems it's because the sort_by is not defined in this case.
This patch
* fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
* modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7621591ae697328798a44a95757352a147e33d72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6885 Allow superlib to delete items from any library
When IndependantBranches syspref is enabled, a 'regular' user can only
delete items belonging to his/her library. But a superlibrarian should
have the permission to delete items from all libraries. He can't for the
time being. This is fix by this patch.
How to test?
- On a multi-libraries Koha, activate IndependantBranches
- Log in with a superlibrarian user
- Find a biblio with one item from another library than the user home
library
- Click on Edit > Edit Items
- On the list of items, all lines have Delete link
- If you try to delete an item from another library than the user home
library, deletion will fail.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
6278 Funny translation bug with XSLT subfieldSelect parameters
This patch resolves the situation of translating the parameters at (meaning subfield a and t) of subfieldSelect by replacing at with a_t. This string will not be translated and the xslt function subfieldSelect just ignores the underscore.
It is a pragmatic and easy solution. Theoretically, we should look for a solution in the translation parser. This is much harder and would probably not result in better code in those modules.
Test this patch with the following remarks in mind:
1) This patch deals with XSLT. So you should enable XSLT at OPAC detail.
2) In English or any language not translating the word at: Just check if the links for a MARC 490, 773, 780 or 785 still work at the opac detail page.
3) For a language translating the word at (like Dutch where at becomes bij), you should first rerun your translation process (at least for the OPAC).
4) In that language: Check the results on the vernacular opac detail page for MARC 490, 773, 780 or 785. Without the patch, you would not see a link following e.g. the Series label (with 490 first indicator set to 1). With the patch, you should see a link now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pragmatic solution for an annoying problem.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a4baa4df1843f1390f372d1569eb446171705742)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 23 Sep 2011 15:49:37 +0000 (11:49 -0400)]
Fix for Bug 5898 - search to hold feature not clearing
Search to hold cookie is now cleared when the user loads a blank
circulation page and when the user logs out.
The user also now has the option to "forget" the current
search to hold patron by choosing an option from the
search to hold menu on the search results page.
Signed-off-by: Liz Rea <lrea@nekls.org>
Tested:
Forget <patron> from search to hold results clears cookie
Logging out clears the cookie - testing note: i had to clear my cookies and test fresh before this would work
Loading a blank circulation page (Check Out from the circulation-home) clears the cookie.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f6656aff84b2e9e47dd3317e8c72d69aaa8e433)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6977 : Adds support for repeatable subfields when importing authorities.
Before this patch, if we tried to import an authority with multiple $x
subfields into a bibliographic record, only the last value get added
to the form.
All repeated values should now be sent to the form.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f97726406697f7973d2f8118049acaac2f95a3ed)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 2 Sep 2011 16:12:10 +0000 (18:12 +0200)]
Bug 5630, follow-up
Fixes chris comment 28, that was a consequence of Marcel comment 27
Recent error
[Thu Sep 01 14:22:45 2011] [error] [client 192.87.126.61] [Thu Sep 1 14:22:45
2011] opac-MARCdetail.pl: DBD::mysql::st execute failed: Unknown column
'limit_desc' in 'field list' at /usr/share/koha/testclone/C4/Auth.pm line 276.
Seems to come from this commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c (5630
CAS Improvements)
Ian Walls [Tue, 30 Aug 2011 14:41:10 +0000 (10:41 -0400)]
Bug 5630 Followup: checkpw_ldap not imported
If LDAP authentication is used, Koha barks that C4::Auth::checkpw_ldap is
undefined, which is true. checkpw_ldap needs to be imported from C4::Auth_with_ldap,
like it was before the bug fix for 5630
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 046c996c2fa8150b8c6a037976c9c22826e04b8b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Sun, 4 Sep 2011 23:02:19 +0000 (11:02 +1200)]
Bug 5459 - Holds not being shifted when merging biblios
Holds are now shifted and reordered by date placed.
Holds already marked waiting, or in transit are not reordered.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 71defcbc6c851f54da223c040aa5d95e0bd43b73)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
F. Capovila patch ported to TT.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7387f27daa110c9165a5d69024bd5b4fad0757e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Thu, 19 May 2011 04:54:38 +0000 (06:54 +0200)]
Bug 6371 Item Types description not properly displayed if not pure ASCII
In several places, C4::ItemType module is used to retrieve item types
and their description. If the description text contains non-ASCII
characters, those characters are not properly displayed.
This bug can be seen in:
- 4xx plugin of a UNIMARC DB
- Home > Admin > Item circulation alerts
- others?...
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Fixes display probems in circulation alerts and 4xx UNIMARC plugin
- display in other places looks ok with and without patch
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d599afe6d044db30f4ba7c233fce774dd8020d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 4 Oct 2011 17:24:05 +0000 (13:24 -0400)]
Bug 6959: can't import record via Z39.50 from MARC edit page
JS to call Z39.50 popup wasn't updated to reflect the change ID values, so the frameworkcode passed was
"undefined" instead of "Default"
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f56dc797546fd9f3037e974ab6f40cb603b33e74)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 28 Sep 2011 13:58:04 +0000 (09:58 -0400)]
Fix for Bug 4223 - Too much serials info - design work needed
This patch reimplements the changes suggested in the original
patch. It puts each main section of the display into its own
tab.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 77d69d1bebbe1b20fd35b39e4be1afda2a899b8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jonathan Druart [Thu, 7 Apr 2011 15:08:48 +0000 (17:08 +0200)]
Bug 6048: printoverdues.sh bash odities
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Note: this script really needs a rewrite, but this patch does fix up the
things it's supposed to fix up.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cfe8b6bd9a4f1921cb728d784083300344bcf2b1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 25 Aug 2011 11:12:38 +0000 (13:12 +0200)]
6786: False detection of index names in Search; make index names case insensitive
Fixing the regex to detect index names in ccl queries. Changing loop
structure: looping through the index candidates in the query is faster than
testing every index name with a regex. Making the index comparison case
insensitive will benefit users misspelling the case of an index; Zebra does not
care about it. Test the change by searching on a word followed by a : or =
character. Previously, when that word contained an index name like an or nb,
the search would crash.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Perltidied the new block to fix indentation
Marcel de Rooy [Wed, 24 Aug 2011 14:12:52 +0000 (16:12 +0200)]
6769 Getting rid of some RIS errors/warnings
Removing unnecessary warnings. Some were based on errors in the script. Others are removed by adding debug flag and disabling debugging mode by default.
Adding carriage returns for Windows users, assuming that it does not hurt the Linux users. (Perhaps a future option?)
Test it with: http://yourserver.com/cgi-bin/koha/opac-export.pl?bib=yourbibnumber&format=ris&op=export [replace server and biblionumber]
Revision of Aug 24: Fixed two missing newlines too.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(removed comment "240811 marcelr during QA"
Bib-level is already indexed in MARC21 record.abs.
But you cannot search this index, because it is commented in ccl.properties and
not listed in getIndexes of Search.pm.
This very simple patch does only do those two things.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f02796d989a377266a844e5b498945372a2a254f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Sat, 1 Oct 2011 15:43:55 +0000 (17:43 +0200)]
Bug 6953 - Value builder for NORMARC 007 does not show further options
A previous commit introduced a missing TT control structure, but
forgot to include the trailing "\" for multiline JavaScript.
This patch simply adds the missing "\".
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7b77c789ee17515931e9d54a23d85234ed9e505)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 19 Jul 2011 13:12:30 +0000 (09:12 -0400)]
Fix for Bug 6600, Library name linking wrong if current location is different
GetItemsInfo in Items.pm includes this join:
LEFT JOIN branches ON items.homebranch = branches.branchcode
This means that the branch URL (from the branches table) comes out
as the URL for items.homebranch, thus the URL in the holdings
output is the item's home branch even though the display might
be showing a different current location.
This patch changes the join to use items.holdingbranch. The join
was originally added to fix Bug 3702, and based on the description
of that feature I'm assuming this change is not harmful to other
usages. However, it does make the assumption that the item's
current (holding) branch is the branch we want to see information
about.
Signed-off-by: Nicole Engard <nengard@gmail.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ade95d5db2f2b6a0a2d47d53aecae26a9997243)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Mon, 23 May 2011 09:27:07 +0000 (11:27 +0200)]
Bug 6268: (MT #6408) Bad Total in basket.pl
The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
But in the budget this amount is the summ of discounts computed for each line.
Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d0b3ef9c2840633ae9860b66babeba3cb453b1b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jonathan Druart [Fri, 8 Jul 2011 09:13:41 +0000 (11:13 +0200)]
Bug 6076: acqui pdf error when marcxml wrong
when marcxml is wrong the PDF is not generated. There is a Perl error
because
the biblio can't be retrieved.
This can be workarounded with a eval when decoding the marc
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Tue, 5 Apr 2011 20:11:15 +0000 (22:11 +0200)]
BZ6074: setting import flag when staged file imported in aqbasket
Lines issued from a staged file have a flag that can be set when the order has
been added in a basket. It's set when a staged file is imported into the
catalogue, it should be set also when a record is inserted through aquisition.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Add order from staged file to a new basket
- Add single order from one item
- Import rest using the bulk feature
- Staged file will no longer be shown after all titles
have been ordered and import_status in import_batches
is correctly set to 'imported'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Thu, 6 Oct 2011 00:55:47 +0000 (13:55 +1300)]
bug_6974: bugfix: do not create empty record before building input for new biblio
It messes up javascript default values
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4c1ea37e6366fc7a17ece602f73de4d7ebfbd279)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 3 Oct 2011 21:43:45 +0000 (10:43 +1300)]
Bug 6958 : Fix for leading spaces being stripped on translation
This will re-add any leading spaces, so formatting is not messed
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
- all examples from the bug report are fixed now
- verified system preferences are still translated
- verified xslt displays are still translated
- verified javascript alerts are still translated
- verified switching languages works
The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value. This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 27 Sep 2011 18:09:45 +0000 (14:09 -0400)]
Bug 6633: SCO return button doesn't work
A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.
This patch adjusts the scope of several T:T variables on the sco-main template to fix this
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a291cc52ca79ed11e0032e73b380b17f3bf308cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 21 Sep 2011 15:08:33 +0000 (11:08 -0400)]
Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode. This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.
This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax: $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 973371a68b1c2a8af7d90afab8db15bda567f606)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Tue, 27 Sep 2011 14:08:33 +0000 (09:08 -0500)]
Bug 6927-- Typo in C4::Overdues.pm
Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails
This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him. :)
Owen Leonard [Thu, 15 Sep 2011 13:42:38 +0000 (09:42 -0400)]
Fix for Bug 6872 - Can't set default SMS messaging options for patron category
Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d5c4a67ec5c91770583edb38ce0213dfa6119c7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL: all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.
Bug 6801: member details page taking long time to load when many checkouts present
This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.
Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).
Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].
Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.
Big ups to Ian for tenaciously hunting this one down.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Larry Baerveldt [Thu, 22 Sep 2011 20:36:05 +0000 (16:36 -0400)]
Bug 4841: biblio-level itemtypes not searchable in advance search by itype
Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a886201cd5e2f7615b92ad727ba136eb105bab)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
A corrected version of the patch of 6 June 2011.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 22 Sep 2011 03:32:24 +0000 (15:32 +1200)]
Bug 6205 - if an include doesn't exist, fall back to en
If a language that doesn't exist gets accessed, then it will fall back
to en for the templates, but not for the includes, so everything still
dies. This allows the process to work in this case too.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. This issue occurs when templates are
partially translated. The main template (.tt) is found for a specific
language, so this language is returned by themetemplate. But in the main
template, some include files (subtemplates) are referenced that can very
well not exist if the translation process had failed to generate them.
This kind of failure is reported by 'translate' script. It's very easy
to miss it, but it's the translator responsability to check it.
Liz Rea [Thu, 22 Sep 2011 18:59:11 +0000 (13:59 -0500)]
Bug 6871 - add schema and sql library reports to guided reports sidebar
This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f688ab5bc84b3522002929c5f65f37581ec1749)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Joy Nelson [Fri, 23 Sep 2011 02:36:48 +0000 (22:36 -0400)]
Bug 6773: circ/ysearch.pl is unlimited
Added a LIMIT 10 to the SQL statement
Edited the circulation.pref stating that autocomplete returns the first 10 results at a time
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38ca8d6de18e630751dcae313d66f8546934fb5c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 16 Sep 2011 14:27:24 +0000 (10:27 -0400)]
Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
- Increases the width of the editor to fill the space provided
- Adjusts the layout of the toolbars to better fit the space
- Adds a custom editor stylesheet to make the contents of the
editor better match the expected output
In changing the toolbar configuration I chose to make the display
of each button explicit rather than assuming a default set of
buttons and adding or subtracting from that. I think this is
clearer for someone approaching the configuration trying to under-
stand how buttons are displayed. I also chose to use the
shorthand "|" instead of "separator" for brevity. This last change
is the only one made to the edithelp configuration.
[2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
fixing help pages editing, and so could be applied before or after it.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3c0883fac72368814e527325fc4e42d59f1339fc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
MJ Ray [Thu, 22 Sep 2011 18:27:43 +0000 (19:27 +0100)]
Bug 6460: alternative fix, updating template and script instead of C4::Log
Add some test cases and fix a bug in C4::Log found by in review. Thanks-to: Katrin Fischer. Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a746e11c1462df4567c007c8e73cf14a55af5ddb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 21 Sep 2011 03:52:23 +0000 (15:52 +1200)]
Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
Signed-off-by: Ian <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bb9e5137110c636334d4039b46c68bfd615b42)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.
Applies to both 3.04.04 and master.
Signed-off-by: Brendan <info@bywatersolutions.com> Signed-off-by: Melia Meggs <melia@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9966d218ae1705b272841c721bf4355437ba5a44)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Thu, 25 Aug 2011 13:01:19 +0000 (15:01 +0200)]
Bug 6755 Problems with switching languages
This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.
It fixes also a bug related to language preselection based on web
browser prefered language.
September 9: Adjusted with input of Frederic Demians.
Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 21 Sep 2011 22:33:34 +0000 (10:33 +1200)]
Bug 6881 - Not able to accept a suggestion (typo in template)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy fix, works great.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4029e8ed755b58c7b3a25c162838c20f5a6ad149)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Fri, 2 Sep 2011 14:21:23 +0000 (16:21 +0200)]
Bug 3704: SIP Checkin of not checked out item returns error without reason
Checking in an available item returns an error (which is correct) without
giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).
Based on code suggested by Patrick Langer <patrick.langer@easycheck.org>
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a2ee6443b9643ad0780ad62ef63d0a06d5c674f0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- add new fund for an active budget
- order item, price 8.00
- check funds page and acq home: committed amount should be 8.00
- receive item, enter actual price 10.00
- check funds page and acq home: spent amount should be 10.00
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4fb88deaa7a0ada50480751cbfadcf1dde75d8eb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6900 - line break between available and reference items
This patch adds a conditional line-break in the availability section of XSLT results.
Signed off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 65e65d7c37e052e6fa8253001f47c497e22e6fd3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Tue, 13 Sep 2011 03:50:26 +0000 (15:50 +1200)]
Bug 6360 - add some more sounds to some happenings on returns
This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e91a453aa5a693c7e15c6e82f14e66471b3ec98)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug_6576: Submit when changing framework rather then reloading
TransformHtmlToMarc(): changed interface - no point passing params when
they can be accessed from $cgi
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c453a45f384ce87a8af4ab9339fb877b11a79105)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 8 Aug 2011 08:29:05 +0000 (20:29 +1200)]
Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.
- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp
Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.
Defining a named sub within another sub, does not prevent that
subroutine being global
Signed-off-by: Frédéric Demians <frederic@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cdea5de355e853f25300821cc641672443177de)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 15 Sep 2011 14:12:27 +0000 (10:12 -0400)]
Fix for Bug 6842 - Branch transfer limits broken
- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
conflict. It was the addition of the javascript table pager
which broke the functionality on this page.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 377f174b0674b009945036c3ac3724378e12e9c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 23 Aug 2011 16:18:44 +0000 (12:18 -0400)]
Fix for Bug 6766 - Template variable scope errors in holds template
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06a939178ccbbcf1809c1b1e7bc1d12124165ff3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Sun, 28 Aug 2011 23:21:24 +0000 (11:21 +1200)]
Bug 5675 : CheckReserves not honouring item level itemtypes preferences
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
With item level itypes activated only the item for which holds were
allowed in circulation rules triggered the hold notice on checkin.
Also checked that biblio level itype still trigered correctly.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a54fc3642ff885a852d197161974233a3fcf299)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug_6318: Always give predefined fields drop downs on label layout edit
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d43aa87d35561266275d840fe890009d8a231772)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 1 Sep 2011 15:14:50 +0000 (11:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
member entry form.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8a876614eddde3025477e228d4ccf533d3cc683)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'
This is just a step in the direction of fixing Bug 5252, not a
complete fix.
This patch also updated a stray reference to Home Email. Both the
OPAC and staff client are updated with this patch.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a71367dc2113de860ca25f735a4996e170e44d6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Remove two warnings from logfile by adding simple checks.
Sept 1, revision: Clearing another warning (thx Owen) too.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit caae541135dedb5d0ccddbf8ffd31887f802332d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 22 Aug 2011 16:23:05 +0000 (12:23 -0400)]
Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
Removed unnecessary readonly attribute from date fields
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8474059769ae921c9dfb8249bc774ade606785fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 92e71131faf55e719f84c6e29314f5abc5714b57)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
This patch does a couple of things.
1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).
To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.
With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.
I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c2015c710355a0ab81306515a70af29e6aef3504)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles
stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f9ccfae400324fdd88597ff81fba42715e50f19d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing
Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.
Owen Leonard [Fri, 26 Aug 2011 20:07:46 +0000 (16:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / branches
Correction for branch admin template stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e1203c95e53422015885a2add288d5cbc9f8733)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 26 Aug 2011 19:56:00 +0000 (15:56 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
Fixing improperly nested template logic inside HTML tags in
clone circulation rules form.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.
This patch removes the "selected" variable from the template.
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 597240e878a2a9808ce103508a42d9ed34a11422)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bbff6b7f9db37714fcdb69b03598600e222237)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 1 Sep 2011 14:53:24 +0000 (10:53 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in the
system preferences editor.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
projects / koha.git / log