This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c9441f4895)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 12031f5b8c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 156f45fe21)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 806fac60f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 a5241093b3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Updating the test
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9c66c42764)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 b255d091fd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>
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.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 57800f2af2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 18e06ecf0b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 4fad65cc26)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a98219dc34)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 48173560ba)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1dbd7bbbf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fe50ffb37f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 038a2cf5d6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- Correcting permissions checks on the home page
- Adding default parameter (1) to numberofreviews subroutine
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8f0c10ef1b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Nice work!
(cherry picked from commit d3c02c6bb6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5d6f770c18)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 90ddf1b254)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 d39262e61d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7dbb966b49)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm that all SQLHelper tests pass.
(cherry picked from commit dbe36a2bf3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests run without problems.
(cherry picked from commit 19d071910f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
New tests run without problems.
(cherry picked from commit a9bbeae6cc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 16c51d0376)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 13f29dd7f3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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 6f043aa82f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Clarified commit message.
(cherry picked from commit d71e696567)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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
http://bugs.koha-community.org/show_bug.cgi?id=5974
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>
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
Signing off, fixes bug reported. Danke!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 28ef6c199b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 924ce3697d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard
Christophe Croullebois
Paul Poulain
Frédéric Demians
Chris Cormack
Brendan
Katrin Fischer
Galen Charlton
Liz Rea
Owen Leonard
Frère Sébastien Marie
Robin Sheat
Chris Nighswonger
Jon Aker
Colin Campbell
Chris Hall
Maxime Pelletier
Jared Camins-Esakov
Albert Oller
Adrien Saurat
Mason James