Magnus Enger [Fri, 2 Dec 2011 16:08:44 +0000 (16:08 +0000)]
Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.
Sophie Meynieux [Fri, 2 Dec 2011 09:04:25 +0000 (10:04 +0100)]
Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a1e3174668181c06baea11161466a1f7bf3a84c4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 7275 - Pagination lost when click in the option "Show more" of facets column
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9b9093d2256b18cc0b813894064e527fbc411998)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Wed, 30 Nov 2011 15:42:19 +0000 (16:42 +0100)]
Bug 7270: Removing double itemtype on shelve contents page when no icon is shown
Just adding a check on imageurl in the template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8ddf6acaee4ce7661d8fd4e9027fca1e56de1ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Hall [Tue, 6 Dec 2011 03:03:59 +0000 (16:03 +1300)]
bug 7239 fix to avoid error being thrown even though a record is created
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.
Owen Leonard [Tue, 15 Nov 2011 16:50:40 +0000 (11:50 -0500)]
Fix for Bug 7227, "Delete all items" action should redirect to the detail view
Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView system preference.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8121f5581ff0f39a31302edace0fc2cf66d65e71)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 2 Dec 2011 20:14:58 +0000 (15:14 -0500)]
Bug 7202 - z39.50 search on bib edit not working
The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created
Robin Sheat [Wed, 23 Nov 2011 05:39:25 +0000 (18:39 +1300)]
Bug 7197 - add a Spanish readme file to the packages
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d023c24e1b649f0a5c2a2570f4bb80f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 14 Dec 2011 14:10:28 +0000 (15:10 +0100)]
Bug 7164 follow-up history.txt and perlcritic compliance
* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed4696321df9b3f4e16b759b1e1a083a5c5e28)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 3 Nov 2011 18:54:39 +0000 (14:54 -0400)]
Fix for Bug 7135: Save button options
This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.
The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
(cherry picked from commit da916a368c98e7f2599cf3a52126d53ee0ecfcd1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 1 Nov 2011 13:21:51 +0000 (09:21 -0400)]
Fix for Bug 7123 - barcode should be one word
Other fixes thrown in for good measure:
- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
output of error messages (don't show error box when there
are no errors).
- Move some errors/messages from the right column onto the
top of the page to match Koha's established pattern.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fff32393cf19fb5ef0a22979bb84a47fa27cc949)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 11 Nov 2011 16:43:27 +0000 (11:43 -0500)]
Fix for Bug 7121 - remove comma on items info
Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template. In the
process I've added subtitle information to the
template.
Ian Walls [Wed, 7 Dec 2011 16:43:20 +0000 (11:43 -0500)]
Bug 7093: placeholds for suggestion table not working in notices
In parseletter_sth, the suggestions table was defined twice. The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber. This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key. This is defined
further down the if/then chain.
This patch removes the erroneous sth query definition.
To test:
1. Place a suggestion with a patron account with a configured email you can access
2. Approve or reject it
3. Verify the message you receive contains suggestion tokens (like title, author and reason)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.
Katrin Fischer [Wed, 30 Nov 2011 07:04:27 +0000 (08:04 +0100)]
Bug 6935: Correct XISBNDailyLimit for new installations
This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.
The file was missed in an earlier update, so new installations
have different values than older installations that were updated.
Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.
To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 61102d16d13a704f27a776350aa6d5582344b7e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Mon, 26 Sep 2011 10:21:58 +0000 (12:21 +0200)]
bug 6917 Dates filters doesn't work when they are not selected on row or column
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9855b834b66bf4b3dc1edb36e1347997d5aded86)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 13 Sep 2011 12:16:13 +0000 (08:16 -0400)]
Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Replaces image-based gradients in:
OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs
Removes obsoleted background image files.
Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit da6c532074adb20158658fab9515bc4af60e8a48)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Wed, 12 Oct 2011 12:00:54 +0000 (14:00 +0200)]
Bug 6803: Replacing remote XSL include
Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.
December 7, 2011: Rebased and included nbsp entity definition (bug 7141).
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5db33970410d5fb43bb1934513ec7d2741b18b3d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Mon, 10 Oct 2011 10:50:23 +0000 (06:50 -0400)]
Bug 6716 : Categories table
This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:
Bug 6716: Document biblioitems and deletedbiblioitems
This patch documents the biblioitems and the deletedbiblioitems
tables. There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.
bug6716: documenting reserves and old_reserves tables
This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.
Bug 6663: Features for holidays.pl with datepicker
Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 806fac60f466b79d9c60023df4425b134040bfdc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Sun, 20 Nov 2011 12:13:28 +0000 (13:13 +0100)]
Bug 7245 Tables population with mandatory data for italian installation
Formatted patch from Fabio Tiana <fabio.tian@gmail.com>
While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.
Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).
Signed-off-by: koha <koha@kohabase.l.i> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a5241093b3cfd564f69b26a76b52ef04eaa5719e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Brendan [Fri, 11 Nov 2011 17:25:15 +0000 (09:25 -0800)]
Bug 7215 - changed callnumber PRESET field to itemcallnumber
Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b255d091fdbfecf1dd82475052ad966546a76e7f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.
Galen Charlton [Wed, 9 Nov 2011 01:44:25 +0000 (20:44 -0500)]
bug 7198: show patron name in overdue list even if name column is null
If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18e06ecf0bfeeefd08575d0512891bea52bc1bde)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Fri, 4 Nov 2011 19:37:11 +0000 (14:37 -0500)]
Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)
I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.
To test:
verify that branchcode is displayed on patron search results from
circulation.pl.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4fad65cc269b049043da2841b491b3c0132ff0e6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 11 Nov 2011 14:00:27 +0000 (09:00 -0500)]
Fix for Bug 7124 - back to search wrapping in lower resolutions
Maybe not a complete fix, but hopefully an improvement. I couldn't
prevent it from wrapping at smaller browser widths, but I was
able to change the style so that when it does wrap it's a little
more readable.
Two parameters are now escaped in title (html element):
- query_desc
- limit_desc
This is a security correction against XSS.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48173560ba583da4fe6d3f2ba2f071573b4b927e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 26 Oct 2011 14:50:11 +0000 (10:50 -0400)]
Fix for Bug 6818 - acquisitions basket groups could use some design work
I've made changes to the basket grouping interface to bring it
in line with other interfaces in Koha. I think it's better to
keep things following a consistent pattern.
On the page which lists basket groups:
- Basket groups listed in a table instead of as custom-styled lists
- Buttons use standard style
- Tabs are generated by jQuery
On the page for managing baskets in a group:
- Markup has been revised to be more consistent with established
patterns.
- Corrections have been made for validity
On the basket view page:
- Display of data has been streamlined a little bit
- An option has been added to the "Basket group" dropdown
for adding a new group
- Markup has been corrected for validity and consistency
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Basket group page
The blue is gone and the new buttons are much better
readable than before.
2) Basket grouping page
Works.
3) Basket view page
I like the new option to create a new group from here.
Nice improvement to the workflow!
I removed a spare 'td' from line 264.
Paul Poulain [Thu, 8 Dec 2011 16:13:38 +0000 (17:13 +0100)]
Bug 6679: fix missing use strict
The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it
4XX.pl also has some perlcritic fixes:
Variable declared in conditional statement at line XXX, column 9. Declare variables outside of the condition. (Severity: 5)
Robin Sheat [Mon, 17 Oct 2011 04:51:39 +0000 (17:51 +1300)]
Bug 7028 - updated the koha-conf.xml template
Now it more closely matches the one that's distributed in /etc
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested. I confirm the code is clean, and tests are not broken)
(cherry picked from commit 038a2cf5d6cf8431af67fa3c4b28aaf3d513f6eb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 31 Oct 2011 08:16:29 +0000 (21:16 +1300)]
Bug 6679 : cataloguing/ now passing critic tests
Declare variables outside of conditionals
Don't use prototypes http://www.modernperlbooks.com/mt/2009/08/the-problem-with-prototypes.html
Use ":encoding(UTF-8)" to get strict validation.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 6 Dec 2011 21:17:12 +0000 (10:17 +1300)]
Bug 5604 : Follow up for missing image
When doing icons, there is a test for them please run
perl xt/author/icondirectories.t
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
see jenkins complaining: http://jenkins.koha-community.org/job/Koha_master/lastUnstableBuild/#showFailuresLink
(cherry picked from commit e615516952fc77f27f1dac02573879a61d9f1ed7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 23 Nov 2011 19:25:20 +0000 (14:25 -0500)]
Bug 7259 - Show a count of items pending approval on staff client home and tools pages
This patch adds count indicators on the staff client home page and
the tools page for the number of items pending approval. On the
home page this includes suggestions, comments, and tags. On the tools
page a count of pending comments and tags is shown.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Counts appear for all types of actionable items listed, all are clickable through to the proper place.
Katrin Fischer [Sun, 30 Oct 2011 23:21:27 +0000 (00:21 +0100)]
Bug 7116: White space on item form for bulk ordering from staged file
Same fix that was done for normal order page and receive page.
Moving the style element for hiding the subfield into the li tag.
AcqCreateItem = on order
To recreate:
1) stage a marc file with 1 - many records
2) make sure you have an acq framework with hidden fields in 952
3) create new basket
4) order from your marc file
5) check item form below the record list for white space
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Followed the steps outlined by Katrin above. Before the patch there are gaping
holes left by the hidden fields. After the patch the holes are gone.
Jon Aker [Tue, 6 Dec 2011 23:06:41 +0000 (12:06 +1300)]
Bug 7020 Items with no checkouts report does not output call number, barcode or item details
When running the Items with no checkouts report and outputting to
screen, the results do not include any identifying information for
the items. The only information listed is the item count and the
branch location.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 90ddf1b2544d26910e3354670ea4aab65eb9b8aa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Fri, 7 Oct 2011 12:19:06 +0000 (13:19 +0100)]
Bug 6987 Make return from Overdues::GetFine consistent
If there is not a fine amount return zero not
undefined or other undefined behaviour
Use more meaningful var names for readability
Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d39262e61d972dfc6bf2fbe3f5d19969e352b34c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 7 Dec 2011 17:04:10 +0000 (18:04 +0100)]
Jenkins complaining = fixing number of tests
(see jenkins build http://jenkins.koha-community.org/job/Koha_master/557/#showFailuresLink)
(cherry picked from commit e06f3ee0fa542c2ab511e8fd2e81680d4a675837)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 7 Dec 2011 14:17:54 +0000 (15:17 +0100)]
Test suite: ignoring backups from vi (files ending with a ~)
On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed!
ignoring any file ending with a ~
(cherry picked from commit 13f29dd7f36137a77695af6c6eb3032ec72d9ae2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 6 Dec 2011 17:50:57 +0000 (12:50 -0500)]
Bug 6291 - Cart printing truncated in Firefox
Alternate fix suggested by http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/
Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7
(cherry picked from commit b03cb0d545caf5cbbe5cab80a9fbb4154c56a508)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6971: XSLT Intranet Detail displays 245 subfields out of order
245 Subfields in the Intranet Detail Display (MARC21slim2intranetDetail.xsl) are
being reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet was displaying 245$a 245$b 245$h. This patch does not address ISBD
punctuation.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Follow-up patch to address the issue in the staff client.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6f043aa82f9c8f20bb70081cc86a42026465193a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Albert Oller [Fri, 18 Nov 2011 18:49:07 +0000 (13:49 -0500)]
Bug 6971: XSLT Opac Detail displays 245 subfields out of order.
245 Subfields in the OPAC Detail Display (MARC21slim2OPACDetail.xsl) are being
reordered on display. Instead of displaying 245$a 245$h 245$b, the stylesheet
was displaying 245$a 245$b 245$h. This patch does not address ISBD punctuation.
Owen Leonard [Mon, 28 Mar 2011 18:08:00 +0000 (14:08 -0400)]
Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
follow-up: trailing " that makes T::T fail
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Bug 5974: Fix broken toolbar on paton checkout tab
Fixed a couple of errors:
- [% CAN_user_staffaccess %] should be [% IF ( CAN_user_staffaccess ) %]
- added missing [% END %]
- added missing line new YAHOO.widget.Button("duplicate");
To test:
1) Open patron account
2) Go through tabs, especially 'Check out'
3) Check toolbars are correct and buttons work
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adrien Saurat [Fri, 4 Nov 2011 13:20:31 +0000 (14:20 +0100)]
Bug 6893 : Updates suggestions list when adding orders
A suggestion added through addorder.pl now changes
to the ORDERED status as initially intended (but so
far it stayed as ACCEPTED).
This fixes the list of potential suggestions to order,
the ORDERED ones don't appear anymore.
Bug 6893 : Follow-up: Disabled WHERE clause excluding ORDERED status
In SearchSuggestions, a WHERE clause was excluding the ORDERED
suggestions from the results. Now replaced with 1=1.
(before 6893 correction, the WHERE clause was excluding the
STATUS='CLAIMED' suggestions, but this status cannot be found anywhere
else in the code... so I changed to STATUS='ORDERED' which
seemed more accurate, but it had impacts on OPAC and some Admin tabs)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Both patches applied cleanly, sqashed them together after testing.
Tested:
1) Creating new suggestions
- from OPAC, shows up in patron account as 'requested', pending in staff
- from staff, shows up in list of pending suggestions
Status in database is ASKED
Note: suggestions made from staff for the same patron have suggestedby = 0
in the database, so are not showing up in the patron account. Is this by
intention? (if not, I think this is a separate bug)
2) Accepting suggestions
- from list
- from edit page
Status in database is ACCEPTED
Patron account shows 'Accepted by the library (Bestseller)'
Note: after changing the status from the list, bug 4068 kicks in and
some tabs and even suggestions are hidden. Going back to the acq start
page and going back to the suggestions page from there helps.
3) Rejecting suggestions
- from list
- from edit page
Status in database is REJECTED
Patron account in OPAC shows 'Suggestion declined'
Note: bug 4068 again.
4) Ordering from suggestions
- new basket
- ordered 2 accepted suggestions
SUCCESS! Great improvement:
- Status in database is now ORDERED
- Already ordered suggestions no longer show up on list of
suggestions to order from.
- Patron account shows 'Ordered by the library (Bestseller)'
- Suggestion management page shows a new tab 'Ordered'
- For the suggestion with a valid 'suggestedby' borrowernumber,
a mail was generated. (bug 7094)
5) Receive ordered suggestions
- received my ordered suggestions
This is is not in the scope of this bug, but for documentation:
- No message was generated to inform the patron
- Status stays ORDERED
- Patron account still shows item as ordered, no change to 4)
Looking at the suggestion.tt I think there should be another status
AVAILABLE.
216 [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 924ce3697dc97767f8d2261552da336afb1552ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adrien Saurat [Fri, 2 Dec 2011 09:46:29 +0000 (10:46 +0100)]
Bug 4051: adds issuedate column to overdues export
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d4f4f88369d52e4ab052af32618f58c1f63a5328)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 13 Oct 2011 18:44:18 +0000 (14:44 -0400)]
Bug 3385 - Add checkout date and renewal date to display list of checked out items
This patch doesn't fix the origial request to add the renewal date
to the list of checked out items, but follows the other bug commenter's
suggestion that the information be added to the item details page
(moredetail.pl).
The other part of this request, to add the checkout date, has already
been fixed by another patch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2177562ecf64a76bb069009358a843bb80e78a41)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Fri, 2 Dec 2011 08:19:33 +0000 (09:19 +0100)]
bug/7285 Use C4::Auth::checkpw instead of checkpw only
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 46831f808610d95af703fc53688c5fa9b5c04fbe)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixing typo in image filename which introduced a space causing problems on win32
http://bugs.koha-community.org/show_bug.cgi?id=5604 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fa0bc2b08d7dfb8a8cbda18fbd6d5ba59aec59ed)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6022: Auth_with_ldap check if categorycode is valid
When importing users from LDAP, Auth_with_ldap.pm doesn't check if value for
categorycode is present in categories table in Koha resulting in referential
integrity error instead of using default value from koha-conf.xml
Test scenario:
1. enable LDAP in koha-conf.xml using <useldapserver>1</useldapserver>
and add <ldapserver> configuration with
<categorycode is="SomeLDAPField">DefaultCategoryCode</categorycode>
2. select/create LDAP user with category in SomeLDAPField which isn't in
Koha
3. try logging in and ensure that assigned category to new user is
DefaultCategoryCode
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0352a8f24ac72b7dfbf84ea3c6f11e2e714708b0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sun, 20 Nov 2011 21:31:47 +0000 (22:31 +0100)]
Bug 6530: Item Due notice label displaying as 'unknown'
Some of the translated sql files still had 'Item_DUE' instead
of 'Item_Due' causing the staff interface to display 'unknown'
instead of the correct description.
To test:
- Do a new installation, using German, French, Polish, Russian or Ukrainian sample files.
- Actived EnhancedMessagingPreferences
- Create a new patron category and check message descriptions display correctly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 30b6edc510c449815f78dbe8d410b296ca36ef76)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 15 Nov 2011 17:01:19 +0000 (12:01 -0500)]
Bug 7225 - "Delete all items" should be greyed out when a title has no items
This patch changes the catalog toolbar so that when there are no
items attached to a record the "Delete all items" menu item appears
to be disabled. Clicking it will trigger an alert, "This record
has no items."
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3be1252e1bab40bd43821e66e2cfc69471e24132)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 7216 - koha-restore does not correctly set home
Prior to this patch, the koha-restore Debian script did not set the home
directory properly for the system users it created, causing problems down the
line for koha-rebuild-zebra. This patch fixes that by specifying the home
directory.
http://bugs.koha-community.org/show_bug.cgi?id=7216 Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 93cd5bd501c9f9d19261bdb5ef429961d56330af)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 30 Nov 2011 17:50:35 +0000 (12:50 -0500)]
Bug 7280 - can't place hold without selecting on list
JavaScript was looking for clicks on links with class "hold,"
and incorrectly triggering the check for checked checkboxes.
Making the selection stricter lets the JS function as it should
while allowing people to place individual holds directly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit f9763a8ec925b8256ccc82c47ec33010601ae1a6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 5 Dec 2011 06:18:21 +0000 (07:18 +0100)]
Bug 6740: can add items at ordering/receiving but not remove
The problem was, that the script was looking for the first
and second <a> tag in the code. When using plugins in the framework
this can't work. The patch changes the script to select the correct
<a> tags by using a class.
Also changes + and - to 'Add' and 'Delete' to make the meaning clearer
and clicking on them a bit easier.
To test:
1) AcqCreateItem = order
- Create a basket
- Create an order line
- Create more than one item
- Delete items
- Check quantity is calculated correctly
- Check items are created correctly
2) AcqCreateItem = receive
- Create basket
- Create 2 order lines, order >1 items
- Do a partial item by removing items from the receive form
- Receive all missing items
- Receive more items than ordered
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d0ef505fc4423f597402445a1a12b8b2bd512894)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that others values for the separator are OK = it is (space, semicolon,... see syspref "delimiter")
(cherry picked from commit 478c2b139ceb58bc619e7c8a5270e499c870dbcf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
projects / koha.git / log