Trim leading and trailing whitespace in the text generated
by the translate_card_element block to avoid generating
unescaped multi-line strings, which breaks the JavaScript
To test:
[1] Test actions in the patron card creator that generate
JavaScript alerts, such as hitting the delete button
without first selecting a batch or profile.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgid that contains the patron card label
element title texts in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
msgid. (search for "BLOCK translate_card_element")
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. Tested updating po file, translating and installing
language, checked on tools page.
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Also removes a commented line that changed the value of $confirm.
If it would default to 1, we do not need it at all.
I am not saying that we need it, but just documenting that we have it.
Signed-off-by: Marc Véron <veron@veron.ch>
Small change in documentation.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
The code introduced by bug 2546 uses an undefined variable (line.title).
It should be ACCOUNT_LINE.title.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
1) Create an account with lots of different charges, fines, fees, etc.
2) Look at the accounts tab in the prog OPAC theme
3) Compare the page to bootstrap theme
4) Verify display is now the same
In my tests I found some things that could still be improved,
but for the goal is to make all OPAC themes behave the same.
Signed-off-by: Marc Véron <veron@veron.ch>
Tested by changing accounttype in table accountlines to all possible
values like Pay, Pay00, Pay01 etc. Both themes display the same values,
e.g. "Payment, thanks (cash via SIP2)" for Pay00
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Prior to this patch, the column for displaying the action links
was too narrow, leading to an ugly display. This patch groups
"action" links into a menu as was done with Bug 11763.
This patch also converts the date column sorting configuration to use
header class instead of an index.
This patch also corrects a couple of HTML markup errors: An
improperly-closed <input> and an improperly closed <option>.
To test, view the invoices page and confirm that the "Actions" menu
button works corectly. Test the functionality of each menu options:
Details, Close, Reopen, and Delete. Confirm that sorting by billing date
still works correctly.
Much nicer user interface. Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
$ git grep authoritysep
This showed:
1) the updatedatabase.pl script, as expected,
2) lots of po files,
3) a test file that was missed.
TEST PLAN
---------
1) prove -v t/db_dependent/Search.t
2) Run koha QA test tools
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work (both patches). Test pass. No koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) View some records with authorities
4) Note your previously set authority separator should still be in use
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch fixes the redirection to step 3.
If you go on installer/install.pl and Koha is already installed,
you should be redirected to the step 3. Without this patch, the
script raised an internal error (500).
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
InstallAuth was in the installer directory, which meant that Plack was
unable to find it, and so running the webinstaller would fail. This
moves it into C4,
Test plan:
* Make sure the web installer runs under plack
* Make sure the web installer runs under non-plack
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
The "Creators" tab in the system preferences editor had only one
preference. In order to consolidate the display as well as to
address the issue that "creators" doesn't have much of a connection
to "patron cards", the ImageLimit system preference is moved to
the Tools tab by this patch.
To test:
[1] Verify that the ImageLimit preference now shows up in the
Tools tab in the system preference editor (along with an
existing Tools preference, MaxItemsForBatch.
[2] Verify that the sysprefs editor no longer has a "Creators"
tab.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
TEST PLAN
---------
1) Set opacthemes system preference to prog
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
-- it's not this time
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described on prog theme, no more duplicate.
No koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch removes the duplicate 'Standard number' option
under the more options of the OPAC advanced search correctly
following updates from Katrin.
TEST PLAN
---------
1) Set opacthemes system preference to bootstrap
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
-- it's not this time.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
In bootstrap opac-auth.tt, the link to "Home" in breadcrumbs leads
to #, it should lead to opac-main.pl like in all other pages.
Test plan :
- Use boostrap opac theme
- Go to cgi-bin/koha/opac-user.pl when not logged
=> without patch, clicking on Home does not change the page
=> with patch, clicking on Home leads to opac-main.pl
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Link ok, no errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
There are three instances of incorrectly-capitalized "Patron Attributes"
on the patron import page. This patch corrects them.
To test, view the patron import page (Tools -> Import patrons). Confirm
that instances of the phrase "patron attributes" in the bottom-most
fieldset are correctly capitalized.
Followed test plan, works
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
[1] Check an item that belongs to a restricted patron and
specify a non-default return date.
[2] Verify that the warning message contains "restricted"
rather than "retricted".
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Patch applies and makes sense. (I have not checked the actual UI,
but that should not be necessary for such a simple typo correction.)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Manual edit of the release notes to hopefully make
them more useful. Also added reminder about the
deprecation of the prog and CCSR public catalog
themes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This is the same issue as bug 12134, but for the patron deatils page.
Test Plan:
1) Add a manual restriction to a patron and wait until the
expiration date of the restriction has passed. This can be
simulated by modifying borrowers.debarred for a borrower and
setting the date in the past.
2) Go on the detail page for a patron (members/moremember.pl)
3) Note the warning message
"Patron is restricted until XX/XX/XXXX View restrictions"
4) Apply this patch
5) Repeat step 2
6) Note the warning message does not appear anymore
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no errors.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bug 10613 sent the billingdate as a string. The template wants a DateTime
object.
To reproduce:
1/ Go on a invoice detail page
2/ Select a billing date
3/ Boom without the patch
[Tue May 20 13:39:18 2014] invoice.pl: Template process failed: undef
error - The 'day' parameter ("2014") to DateTime::new did not pass the
'an integer which is a possible valid day of month' callback.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Not all dates will make it go 'boom' but 31/07/2014 did.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Trivial fix for small regression (closed invoices are displayed as
"Open" on details page, and it's not possible to reopen the closed
invoice using "Save" button) introduced by bug 10613.
Test plan:
1) Create and close some invoices
2) Note that closed invoices are erroneously displayed as "Open"
on individual invoice[s] details page
3) Apply patch
4) Check previously closed invoices; their status on details page
should now be properly displayed as "Closed on ..." (and an option
for reopening would reappear as well)
5) Ensure that "Close" / "Reopen" checkboxes followed by "Save" button
do work as expected for individual open / closed invoices respectivelly.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Accidentally the ISSUESLIP got copied to the RESERVESLIP.
This adds the correct text and formatting to the RESERVESLIP.
To test:
- Run the German web installer on an empty database
- Check that the ISSUESLIP and RESERVESLIP notices are different
and display correctly
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller, all optionals, all ok.
ISSUESLIP(Ausleihquittung) longer than RESERVESLIP(Vormerkung)
No errors
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This updates the German default frameworks for bibliographic records
and authorities using the files created from the po files on Pootle.
To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller.
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This updates the German simple and fast add frameworks
using the files created from the po files on Pootle.
To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller
Checked
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Changes:
- Translates new notices SHARE_ACCEPT und SHARE_INVITE
- Copies subtag_registry.sql from en as after applying patch
from bug 12275 - so 'Laotisch' will show up correctly
- Rephrases and corrects spelling for user permissions
- Translates new authorized value SIP_MEDIA_TYPE
- Improves translations of creator sample data
- Improves translations of sample patron categories
- translations in po files were changed accordingly
To test:
- Run the web installer, install all mandatory and optional
sample data
- Check everything is installed without errors
- Verify changes listed above in the interface
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Installer works ok, values ok
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
- Corrects the German translation for 'Laotisch'
- Adds an icon to the reference item type
- Corrects capitalization for user permissions
To test:
- Run English web installer, make sure to select
the sample item types and all mandatory data
- Check user permissions appear correctly
- Check icon for REF itemtype is shown correctly
- Check that languages in Advanced Search appear
as normal
- Install German and check in language list on
advanced search 'Laotisch' now appears
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well following test plan.
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Test plan:
prove t/db_dependent/Budgets.t
Note: This addition may sound overkill but I found this bug developing
bug 12164 and I will reuse all of that.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
A really weird (and old) code process the calculation for the spent and
ordered sublevel funds.
It only takes into account the direct children.
So if you have:
fund1 (spent=100) parent of fund11 (spent=10) parent of fund111 (spent=1),
you get:
fund | base-level | total spent
fund1 | 100 | 110
fund11 | 10 | 11
fund111 | 1 | 1
which is wrong, it should be
fund | base-level | total spent
fund1 | 100 | 111
fund11 | 10 | 11
fund111 | 1 | 1
Test plan:
- Create 1 budget and 3 funds with the same structure as above.
- Create some orders and receive them (not all).
- Go on the fund list view and verify the values are correct.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
There's no point asking the user if they want their Apache Koha
configuration updated if there's no configuration needing updated.
This also fixes a case where the updating would have failed when running
on Apache 2.4.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I agree with adding that checks, and the conditions rewrite seems cleaner
than my first approach. So, I sign it.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch makes the install scripts take care of the new file
and prompt for user confirmation on the apache file renaming step.
Both prompt and the renaming actions depend on the fact that there
are instances with their files missing the .conf appendix.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
As asked by Robin, a bash lib of functions is introduced with the common
functions to be reused. Most of the scripts are modified (reduced) to
include this file and the repeated functions cleaned.
No noticeable change in behaviour should be noticed.
As I've been todl in #debian-mentors, it is used that files for inclusion
should be installed at the apps directory (i.e. /usr/share/koha/) so this
patch makes the install script put the file in the bin/ directory.
All koha-* scripts assume the file is there already (and fail otherwise).
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Apache 2.4 expects the sites definition files use the sufix '.conf'
To reproduce:
- Install the 'koha-common' package on Debian 7 or Ubuntu 13.10+
(both known to include Apache 2.4).
- Create an instance (for example testlibrary) using the supplied
commands:
$ koha-create --create-db testlibrary
> FAIL: apache reports an error like this:
"ERROR: Site testlibrary does not exist!"
This patch adds a test on the Apache version and appends the ".conf"
sufix if needed.
To test:
1st step: koha-create gets fixed:
-- The hard way --
- Apply the patch, and build the koha-common package on top of this
commit.
- Install the built package on an Apache 2.4 Debian-based distro (Debian 7
or Ubuntu 13.10 will work)
- Create a test instance:
$ koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.
-- The easy way --
- Apply the patch, and copy the koha-create into an Apache 2.4
Debian-based distro
- Create a test instance using the koha-create script you just
copied:
$ ./koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.
2nd step: the rest of the touched scripts keep working as usual
koha-disable
koha-dump
koha-enable
koha-list
koha-remove
koha-restart-zebra
koha-stop-zebra
koha-start-zebra
They should all keep working. Can be tested "the easy way" too.
Note: there might be another issues regarding Apache 2.4 deployments
like the need for
$ a2enmod access_compat
and perhaps some directory permissions tweak, which I think should be
properly documented on the install instructions.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch adjusts the test so that if an "ISBN" is not
defined (because the source string did not specify a valid
ISBN), it doesn't result in a warning once the warnings
stricture is enabled in C4::Koha.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch fixes a problem where search errors like this in the logs when
running a stage import with the AggressiveMatchOnISBN syspref turned on:
search failed (isbn,phr=978-0-7517-9745-9 or isbn,phr=0-7517-9745-6 or
isbn,phr=978-0-7517-9745-9 or isbn,phr=0751797456 or
isbn,phr=9780751797459 or isbn,phr=978-0-7517-9759-6 or
isbn,phr=0-7517-9759-6 or isbn,phr=978-0-7517-9759-6 or
isbn,phr=0751797596 or isbn,phr=9780751797596 or isbn,phr= or
isbn,phr= or isbn,phr= or isbn,phr= or isbn,phr=) CCL parsing
error (10014) Search word expected ZOOM at
/usr/share/koha/lib/C4/Matcher.pm line 688.
This is most easily seen when running the script from command line
/misc/stage_file.pl.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
[1] Run prove -v t/Koha.t. The last test should fail.
[2] Apply the main patch for this bug.
[3] Run prove -v t/Koha.t again. This time, all tests should pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This updates the basket help.
To test:
* Open a basket
* Click help and confirm it's right and there
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok
Final comment: koha-qa complains about tabs, removed in followup
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch updates 3 help files.
To test:
* Visit Administration > Patron Categories
* Click help
* Confirm it's there and right
* Visit Administration > Currencies
* Click help
* Confirm it's there and right
* Visit Administration > Circ Rules
* Click help
* Confirm it's there and right
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok. One comment: on circ rules, I think that "you're" can
be correct, but I prefer "you are"
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch adds a few new values to the authorized values help
To test:
* Visit Administration > Authorized Values
* Click help
* Confirm help is there and correct
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
New values ok
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Updates the 2 notices help files with new info.
To test:
* Visit Tools > Notices & Slips
* Click help and confirm it's there and right
* Visit Tools > Overdue notices/status triggers
* Click help and confirm it's there and right
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Long help ok
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch updates the search help file.
To test:
* Visit Search
* Click help
* Confirm help is there and correct
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch adds a bit to the addbiblio help file.
To test:
* Go to Cataloging
* Click add new
* Click help
* Confirm help is there and correct
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help is ok
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
