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>
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4
This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.
Removed template toolkit directives from within HTML tags.
Advanced Search > Scan Index > Search results
Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
index as 'Series'
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 282a2d60b830b22661cc0324a84b7c17b7b905d1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Removes template toolkit directives from within HTML tags.
Acquisitions > Suggestions
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes templates directives from HTML tags in sco-main.tt
Problems were related to buttons for renewing items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
After, no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4530159ce13eb6ff823d6ef49ad847d92556f356)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixes problems with template toolkit directives within HTML tags
for the serials module.
Serials > add/modify subsciption
serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes templates directives from HTML tags in the
rotating collections module.
The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from OPAC detail view.
Problems were related to the items tabs for holdings, subscriptions, and serial collection.
Fixed the problem spotted by Frère Sébastien Marie - thx!
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6d6c9626274268e82d6fa433894f188b995c913b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27c87aea11243e63c2600d71a154d425b3269c13)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes templates directives from HTML tags in masthead.inc
Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83
After no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 637953df93f7090de846e1f274a1e721687a9277)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb7b258ec2220fcf6a86d49132b0224175f0a344)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from
authorities > modify authority.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1866c4939df4298d561bc9f5fe617644a9955371)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from
Tools > Tags.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes template directives from within HTML tags from
circulation > overdues.
Problems were related to patron flags pull down and sort by loop for patron attributes.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18844d6bf1f1c6cf93cbe833067fe747753856b9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75bfa2a56a857417cf99d605f0f903e14ec0f204)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Thu, 30 Jun 2011 06:47:35 +0000 (08:47 +0200)]
Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.
This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.
To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db
Ian Walls [Fri, 9 Sep 2011 18:37:22 +0000 (14:37 -0400)]
Bug 6863: Shelf Browser images not showing up
Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b49534ebdc11c36844c87d9588fc4e420509b77e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 9 Sep 2011 10:34:56 +0000 (06:34 -0400)]
Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.
This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 156a849aa3759f377af07d4cdc7a6f58e58c18f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Fri, 9 Sep 2011 03:50:07 +0000 (15:50 +1200)]
Bug 5602 - [3.4.x] Rewrite of package building script
Note: this is pulling in the most recent version from master. Working
with two different versions that have two different options was getting
painful, and it doesn't touch anything outside of debian/
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb781f2dcd12fe2cb7562f24ea287e5111493480)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6750 Guarantor search broken on translated templates
Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f64aaf063ea39b70c6f128d74d296566a021d217)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Sun, 28 Aug 2011 01:19:55 +0000 (21:19 -0400)]
Bug 6256: Many bib1 attributes missing
This patch adds all the bib1 attributes listed in the bug report, in numerical order. Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped
In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition. The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally
Signed-off-by: <dev_patches@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d8b1713da45ca82d67668a00bd345d9fcead717)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 5 Sep 2011 02:50:29 +0000 (14:50 +1200)]
Follow up for 6665 : Fixing the hide_marc pref also
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 34b553d03b96cb3c84ec978f6eea542f38f60de3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 5 Sep 2011 02:42:55 +0000 (14:42 +1200)]
Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
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 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Sun, 4 Sep 2011 23:27:40 +0000 (11:27 +1200)]
Bug 6555 : only 10 lists show in the staff client
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 e23608a1f90b7d25068870e82a19721fd70e60a5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Brett Wilkins [Mon, 29 Aug 2011 04:47:48 +0000 (16:47 +1200)]
bug 6724: enable decimals on values greater than 1
Separating perl standard uses from koha uses
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 f824121bb136b08ae3308168a0deeb524518fdde)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Mon, 29 Aug 2011 00:24:45 +0000 (12:24 +1200)]
Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6534b5cf29ea044f405af976447fe67262780a0d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Tue, 9 Aug 2011 08:22:20 +0000 (10:22 +0200)]
Bug 6516 - Make borrowernumber of staff user configurable in koha-create
Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.
Remember to update the wiki if this gets pushed!
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8d8d2e6b441415724e667af95fefd9b0ea9c1bbc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 10 Aug 2011 11:46:18 +0000 (13:46 +0200)]
Bug 6121: follow-up = using overloo instead of reserveloo
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.
BibLibre MT5647
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b2138a7ec64dead316286df4a822bf89d051f4cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 23 Aug 2011 18:57:02 +0000 (14:57 -0400)]
Fix for Bug 5028 - Remove references to catmaintain.pl
catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ca16532ea8270b14178ab47cb26f48c53f64a20a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 23 Aug 2011 18:52:37 +0000 (14:52 -0400)]
Fix for Bug 6768, Two unused include files can be removed
Removing error-top.inc and error-bottom.inc
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7146449ace983a92221601057e04825b6403d698)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug4966 - follow up to 4966 changes language from 'end' to 'finish'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bb958cc6135a3ab8e83068b67ac0da345d20a0a0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sun, 17 Jul 2011 15:18:47 +0000 (17:18 +0200)]
Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
Patch fixes some translation issues and address formatting for printed
hold notices.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba4419be0826f9535e92d1bbf3612f7bf0695b7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sun, 17 Jul 2011 14:20:00 +0000 (16:20 +0200)]
Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Translates the purchase suggestion mails in sample_notices.sql from English to German.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ba78d6a8503d9340797eeabf2f9655efaee6f993)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Fri, 2 Sep 2011 03:31:28 +0000 (15:31 +1200)]
Bug 6834 : Removing last of the $template->{param_map}
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6479 Converts all the serialseq variables to UTF-8.
Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit acc684bc01fca37615009a778ba5927e40f52d29)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 22 Aug 2011 20:09:05 +0000 (16:09 -0400)]
Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Removing unused script.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f9413ca2d20199a366928926ad8321dde50d12c1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 30 Aug 2011 17:49:51 +0000 (13:49 -0400)]
Bug 6351: Cannot delete library-specific holds polices and checkout limits
Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.
Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cb6c40faf78fa25b752c3c51abc98435e9afe4cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 29 Aug 2011 04:46:11 +0000 (16:46 +1200)]
Bug 6704 : Escaping html in the merging records, so " don't break the merge
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> 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 720e3012a87ca437c17e864f159138304ed0c006)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Fri, 26 Aug 2011 01:42:44 +0000 (13:42 +1200)]
Bug 5524 : Cant delete list from the second page of lists
Includes follow up fixing deleting lists in OPAC
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 e39de040206eae26e22d6375479b548017cb7217)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 29 Aug 2011 02:14:58 +0000 (14:14 +1200)]
Bug 6528 : Cataloguing search not showing location for available items
Cataloging search now shows holdings information.
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 ff4b179e14ab15bf5d20852a37e2b0a2dca45800)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders
Owen Leonard [Thu, 11 Aug 2011 19:21:35 +0000 (15:21 -0400)]
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd744e6f2af85110cefa8d9e613393a0a517185b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 10 Aug 2011 15:44:37 +0000 (11:44 -0400)]
Fix for Bug 6696, New category button broken when no categories defined
The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.
This patch hides the table in cases where there are no
categories and displays an error message instead.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a94a9f745556d42e5018695dbaa70a72129cc993)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 1 Aug 2011 11:51:18 +0000 (07:51 -0400)]
Fix for Bug 6652, Zip showing in funny place on libraries admin
This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.
It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:
[name]
[street address]
[postal code + city]
...or any other variation of course.
While I'm in there, also making branch URLs and emails clickable.
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 3731ec80fc407ba4668450b48c9c81b8c0a98460)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 26 Aug 2011 19:14:48 +0000 (15:14 -0400)]
Fix for Bug 6791 - editing list with apostrophe loses text
Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e73965c62f3895d5bdf5ad0a52c89e54e248f8f1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Fri, 26 Aug 2011 16:14:25 +0000 (17:14 +0100)]
Bug 6733 - Change return page after printing routing slip
Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 99b51e03183ec79f6ce46834207511702c2599d6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216
http://bugs.koha-community.org/show_bug.cgi?id=6765 Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a7c9167660493bc1a01a93dddba37a1a3683bc0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 22 Aug 2011 15:08:59 +0000 (11:08 -0400)]
Fix for Bug 4419 - cannot change module for notice templates
Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.
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 eb7456c685db962f0c1c3d1d88421711a7ec4a7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Sat, 20 Aug 2011 23:33:18 +0000 (19:33 -0400)]
Bug 6662: Remove Dewey Specific References in Sort
The sort option used to include tooltips for call number
that were Dewey specific. This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.
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 57a0fcb475ff7e353329ba9a7e5963a22351b4c9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Mon, 22 Aug 2011 12:02:03 +0000 (14:02 +0200)]
6747 Checks in opac-export
Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.
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 223156ea74233122c35d16100724eddbcd69d66a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Thu, 25 Aug 2011 03:21:01 +0000 (15:21 +1200)]
Bug 5866 : Updated patch to speed up holds awaiting pickup
This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 24 Aug 2011 13:50:19 +0000 (09:50 -0400)]
Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Corresponding fix for the OPAC
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 666a2316d8adbd8fadba263c42dba71fe992532c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 07838bfcb16bf329bbc4953dff5b624005a8a734)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Tue, 28 Jun 2011 19:24:45 +0000 (15:24 -0400)]
bug 6538 update letter.pl help file
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 13fd914b086d32c69c190a6fa0279fc2b2054780)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 10 Aug 2011 15:16:42 +0000 (11:16 -0400)]
Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
The markup for the fields for enrollment period "in months" and "until date"
was non-standard I think because the two fields are supposed to be visually
and functionally linked (having the same purpose and being mutually
exclusive).
This patch changes the markup so that the two fields share a fieldset
having "choose one" as the legend. The "hint" is now hidden unless
it is triggered by the javascript validation on submit.
I wanted to trigger the validation of the two fields onblur instead
of just onsubmit, but found that the datepicker widget doesn't
consistently trigger a change or a blur event on that field.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Layout problems are fixed
- Layout is more clear about choosing either 'In months' or 'Until date'
- Clear error message shows when you enter values in both fields
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 54e0667b23466043de2ddd73b0b0e37f9632ea06)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
Function _export_table_csv modified to remove CR/LF in the data
from the database to built a correct csv file.
Function _import_table_csv modified to deal with CR/LF in the data
field. When a line is found with an unproper end (a data field has not
end quote), it's concatenated to a temporary buffer until the next
line ends ok and then it's proccessed.
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 6b69260fbd75f80b1831341b9bb5b18b54fef56b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 19 Aug 2011 18:40:48 +0000 (14:40 -0400)]
Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
Missed a couple of instances of the pagination menu on the
lists page. Previously the pagination links on the page
listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
unstyled. After this patch the links should be styled.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f884128f67125c542daae77b32108e6cf14a5a5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 18 Jul 2011 19:38:13 +0000 (15:38 -0400)]
Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
a new dictionary definition. Before the patch, in Step 4 you would not see
any kind of form field for entering a comparison. After patching Step 4 will
offer you a field labeled "Search string matches."
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes described problem with mediumtext columns.
Magnus Enger [Mon, 15 Aug 2011 07:00:07 +0000 (09:00 +0200)]
Bug 6540 - Followup - koha-create would die without --configfile
koha-create would fail to check that --configfile was set on the
commandline, before either including it if it existed or dying if
it did not. This patch should make sure the existence of a
configfile is only tested if --config is set.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
This should apply against 3.4 and master. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 31bb901e2b31748dd86e7da45672c42a5359c5a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 16 Aug 2011 12:38:21 +0000 (08:38 -0400)]
Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
The SMS section of the template was commented out in the patch
pushed for Bug 5889, 'Allow message names to be translatable'
with the comment 'fixing columns overflow.' That seems to have been
a cosmetic fix for what I can only imagine was a different bug?
Also fixing a T:T variable scope error.
After applying this patch the "SMS" column in the Patron messaging
preferences should appear when the SMSSendDriver preference is not empty.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3270d384c53c04eee44fa54ed065eebb0741df22)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 17 Aug 2011 20:04:55 +0000 (16:04 -0400)]
Fix for Bug 6728, Table sorter for receiving acquisitions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cbdb5a823aa6387e77adb63e3ff389103ce8f603)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 18 Aug 2011 20:25:32 +0000 (16:25 -0400)]
Fix for Bug 6753, Markup corrections and improvements for label export window
The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.
To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 77e1a62efa6814b1beaefd5f8dd99b31643182bc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 19 Aug 2011 18:38:37 +0000 (14:38 -0400)]
Fix for Bug 6754, Improve breadcrumbs on lists pages
Breadcrumb navigation on the lists pages should give the user links back to the
category of list they're viewing, public or private.
Patch changes this:
Lists -> Contents of (Your list)
To this:
Lists -> Your lists -> Contents of (Your list)
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 02f1058a80c4bd4f28331ce389c71a32b3fe1294)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
projects / koha.git / log
![13 years agoBug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=aa2284e1113cb74b94c7da2fa43e423b690a9566){kind=link}
![13 years agoBug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=e5c056dba58188d6687323d190d656f162330615){kind=link}
![13 years agoBug 5602 - [3.4.x] Rewrite of package building script](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=342d6aaecec84beb0ad1bd0b75714e29490b266d){kind=link}
![13 years agoBug 4877 [ENH] - [SIGNED-OFF] more man page improvements](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=69e368bcd1a6d0fb6dfe3ba849fa792b5e5cef05){kind=link}
![13 years agoBug 4877 [ENH] - Update man page for koha-create](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=552a686e98b46d24f393a0dcd09e08e7f82dc091){kind=link}
![13 years agoBug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_P...](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=af4fa67db0289e09e8420119f5ce860767ab5646){kind=link}
![13 years agoBug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails](/gitweb/Members/foo.jpg?p=koha.git;a=commit;h=dde11c152132d49102bb27d7bd2c8a4778bc6595){kind=link}
