Commit graph

268 commits

Author SHA1 Message Date
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
bd4bf5485c Fix for Bug 6109, Hey!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:04:20 +12:00
69d4d8f1cc Bug 6084: Follow up - fix more translation markers
grep -R 'alert("' *

was not enough. I needed

grep -R "alert('"

too!.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:47 +12:00
33c7b21cde Bug 6084: Missing translation markers in javascript alert messages
I ommited commented lines and "if $debug" lines too.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:45 +12:00
Henri-Damien LAURENT
99b49e2b1a Bug 6014 : MT3138 Adding some permission management to viewlog
If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.

C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated

circ-menu.inc:
Fixing information passed to the viewlog from circ-menu

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 13:14:17 +12:00
e5010b283e Bug 5401, WYSIWYG for Koha news: Testing TinyMCE
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 20:35:49 +13:00
b9cee99da4 Bug 5065 Add ability to choose framework on import
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:36:35 +13:00
8af91c079a bug 5783: Authorities edit logging
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:12 +13:00
6ded7b9897 Fix for Bug 5814 - Style error message on manage staged records page according to standard
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:23:15 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
koha-preprod
de491849ac Add markers to text in Javascript variable in order to be translate.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:13:06 +13:00
Chris Cormack
35b47b6ff7 Bug 4931: Stocking can be by homebranch or holding branch
Squashed commit of the following:

commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Jul 13 11:58:01 2010 +0200

    (bug #4931) fix forgottens input in buttons

    the previous patch missed an hidden input in next buttons that break next page. This fix it.

commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Jul 2 15:27:59 2010 +0200

    (bug #4931) add the ability to choose home or holding branch in stocktaking

    This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 13:50:57 +13:00
Nicole Engard
4173f2221f bug 5492 update import patrons page title
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 23:04:11 +13:00
d2b9602e53 Fix for Bug 5540, editing slip news changes to librarian interface
The script checks for a language-specific OPAC message and, if none
is found, preselects none of the "display location" options. This
results in the first item in the <select> behing highlighted by
default, "Librarian interface." If we want to select "slip," we
must add an explicit check for it.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-29 20:27:43 +13:00
Chris Cormack
3c19f22f86 Merge remote branch 'kc/new/enh/bug_5283' into kcmaster 2010-12-20 10:44:03 +13:00
Chris Cormack
206e0709d7 Bug 5283 Follow up, fixing broken template syntax 2010-12-20 10:42:59 +13:00
Chris Cormack
c9465ed9df Revert "Merge remote branch 'kc/new/bug_5373' into kcmaster"
This reverts commit bf5a328af6, reversing
changes made to a904a9bac7.
2010-12-20 10:08:02 +13:00
koha
05965fb56d Bug 5283 NEWS ITEM FOR RECEIPT SLIP
There is no on-off global parameter for it since if a library does not want to
use it, then the library will not use the "slip" category in news - this is
similar to the OPAC news and Staff news categories in the news feature.

We have been using this for months in Koha 3.0 and the librarians like it and
so does PR as it gives a way to advertise events and news to patrons with every
checkout.

The files modified are:
koha-news.tmpl
moremember-receipt.tmpl
moremember.pl

Darrell Ulm

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:39:11 +13:00
Garry Collum
cf6867db62 Bug 5373: Adds cardnumber to the field list of the Import Patrons NOTES.
Adds 'cardnumber' as an option to the list of possible fields in the NOTES section of the patron import tool.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:08:24 +13:00
bd7cca935b Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.

Revised for current HEAD

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:10:57 +13:00
2b53b14bac Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 22:14:19 +13:00
cb969684da Fix for Bug 5285, Show/hide columns in the output of items in batch operations
Also adds title/author information to output of batch deletions

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:45:30 +13:00
e6ebf10bba Fix for Bug 4851 - Batch delete shouldn't show delete button if no items were found
- Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:47:12 +13:00
Chris Cormack
b1c2d560b6 Bug 4211: This patch should provide a working way to send out mail from suggestions
Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc

Squashed commit of the following:

commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:41:34 2010 +1200

    bug 4211 parsing the letter before we enqueue it

commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:32:09 2010 +1200

    Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent

commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:36:26 2010 -0400

    Fix for Bug 4211, Acquisitions actions on suggestions don't generate email

    Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
    notices are added by hand (or from default sql--see Bug 5127) this
    correction should get suggestions notices properly enqueued.

    Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:27:33 2010 -0400

    Fix for Bug 5126 - Suggestions module missing from "add notice" form

    - Adding "suggestions" entry
    - Re-ordering options in alphabetical order

    Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
fa43573b58 Fix for Bug 5210, back button on batch modification result page useless
I can't see any good use for a back button here, so I'm taking it out.

An improvement might be to build in a method to resubmit the same batch
of barcodes/item numbers again so that you could make additional
changes to the same set.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 11:22:39 +13:00
ba35ce60e1 bug 4991: follow-up tweaks
* make some strings translatable
* display library name instead of code in add/edit
  holiday panel
* minor textual fixes to hints

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-02 15:02:54 +13:00
1117f6920c Fix for Bug 4991, Overhaul of Calendar interface
- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
  forms in Koha
- Change the way dynamically displayed hints are shown to better
  match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
  only description could be edited).
- Add links to the list of existing single-day holidays and
  exceptions which opens the calendar to that month/year

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-02 15:02:54 +13:00
Chris Cormack
f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
041207b5e2 bug 5146: patron import files require header row
Fixed help text on this point as well as options for
supplying dates in the input file.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:30:20 +13:00
Bernardo Gonzalez Kriegel
d942e55819 Bug 5130 - Misspelled words: biblographic delimeter extention
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:51:34 -04:00
6b88131f80 defer rotating collections
Disabling rotating collections for 3.2.0 release; after more testing,
candidate for 3.4 as well as backport into 3.2.1.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 21:12:20 -04:00
8a5cf3605b add explicit type to <input> elements missing it
Quells a warning from xt/author/translatable-templates.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 17:44:34 -04:00
8a9b4f0695 Followup fix for Bug 4453: Removing invalid template fragment.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:23 -04:00
841da504e8 Further corrections for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:26:29 -04:00
7b11d2a281 Fix for Bug 4453, Improve formatting of batch item operations
- includes fix for Bug 4443
- includes some string changes, could resubmit without if these
  changes block inclusion in 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:14:07 -04:00
Nicole Engard
bf380b8964 bug 4442 rename batch edit tools
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 14:00:17 -04:00
Matthias Meusburger
6532f712b7 MT2621 : Fix simple barcodes display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:42:10 -04:00
Matthias Meusburger
99a84a6ee0 MT 2553 : Adds a Cancel button
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:30:07 -04:00
Matthias Meusburger
c8bf22893e MT 2553 : Adds background job for items batch modification
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:57:04 -04:00
Matthias Meusburger
7f3df2735d MT 2269, Follow-up : Granular permissions for items batch modification and deletion
Change of permissions names
Change of branch title in guided reports
Add a "Select All / Clean All" on items selection
Add a link to item when a given item cannot be deleted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:55:39 -04:00
Matthias Meusburger
4dd2086deb MT 2269 : Do not display all the items if there is a large amount of items
Also fix the barcode not found problem (due to empty lines)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:52:15 -04:00
Garry Collum
a8927736dc Bug 4307: Sorts library locations in inventory drop-down list.
Replacement patch for previous patch submitted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:06:25 -04:00
Nicole Engard
0fc929f9cd bug 4410 - change member to patron to be consistent
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 20:59:38 -04:00
Lars Wirzenius
4523a2df0d Fix file permissions: if it is not a script, it should not be executable.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 00:40:34 -04:00
9d44a624a3 Fix for Bug 4262, changing matching rule add big message box
Fix includes a change to the format of the page to consolidate
matching rule settings with matching rule controls. This
reduces potential confusion from the placement of the message
box. Assuming that matching rule settings and controls were
displayed separately for clarity and control, I've added
JavaScript which allows the user to change their mind after
changing a selection (but before submitting). It's a new
interaction which I hope is useful.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 00:01:02 -04:00
Jane Wagner
b35acf5c38 Bug 4270 Instructions for loading patron attributes are wrong
Corrects the on-screen instructions for loading multiple patron attribute fields

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 12:55:53 -04:00
Matthias Meusburger
64b79bf620 MT2116 : CSV Exports : add 'new line' as separator
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 08:00:53 -05:00
Garry Collum
679548c302 Bug 4181: Fixes XHTML in viewlog.tmpl.
Also adds zebra striping to the data table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:11:52 -05:00
9b98fc778d bug 4169: fix item batch modification for MARC21
The MARC21 framework uses $0 for the item withdrawn status.  Because
of how the tool had marked the barcode and stocknumber as being
uneditable, this resulted in an off-by-one error, causing the wrong
item fields to be updated.

Fixed by simply not including the uneditable fields in list
of item fields that can be edited - if you can't change the barcode,
there's no point in displaying it in the list of fields.

Also fixed how the bib title/author/ISBN got displayed so that the
withdrawn column gets displayed after an item update.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
2010-02-12 15:03:00 -05:00
Nicole Engard
4016173b2c bug 4153 move messages on inventory tool to top
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:46:58 -05:00