]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoMerge branch 'master' of git://git.koha-community.org/koha into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:54:25 +0000 (08:54 -0400)]
Merge branch 'master' of git://git.koha-community.org/koha into 3.14-master

11 years agoMerge branch 'bug_8896' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:50:15 +0000 (08:50 -0400)]
Merge branch 'bug_8896' into 3.14-master

11 years agoBug 8896 QA Followup for regex
Marcel de Rooy [Thu, 11 Apr 2013 10:48:26 +0000 (12:48 +0200)]
Bug 8896 QA Followup for regex

Making sure that the regex does not kill more than it should.
Amended: does now only look at separating colons(;) not commas(,).
Amended: two index expressions in direct context replaced by same regex for
consistency.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8896: Delete serials no more missing from missinglist
Lyon3 Team [Mon, 8 Apr 2013 09:14:09 +0000 (11:14 +0200)]
Bug 8896: Delete serials no more missing from missinglist

When manual history is disabled in subscription history section
if a serial has been previously set as missing and is received
or set as expected, late or claimed, it will be deleted from missinglist

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Regex needs a followup. More comments on Bugzilla.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10166' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:38:33 +0000 (08:38 -0400)]
Merge branch 'bug_10166' into 3.14-master

11 years agoBug 10166: Increment holdable counter
Jared Camins-Esakov [Mon, 6 May 2013 12:35:00 +0000 (08:35 -0400)]
Bug 10166: Increment holdable counter

The $anyholdable variable was set to 0 or 1. However, as it is set in
a loop, and future changes to the opac-reserve.pl script may require
knowing how many items the patron is going to place a hold on, it makes
more sense to treat $anyholdable as a counter. This follow up turns it
into one.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10166 - Can't place holds on multiple titles if one or more are un-holdable
Owen Leonard [Wed, 1 May 2013 18:22:50 +0000 (14:22 -0400)]
Bug 10166 - Can't place holds on multiple titles if one or more are un-holdable

opac-reserve.pl tries to check whether all selected titles in a
multiple-hold batch are unavailable to be placed on hold. However, the
logic is flawed in such a way that if the last item in the batch cannot
be placed on hold the script assumes none can be placed on hold.

This patch modifies the way the script tracks the "no titles available
for holds" variable in order to correct the error.

To test, place multiple holds by selecting titles from a list of search
results. Test three conditions:

- All titles are available to be placed on hold

  You should see no onscreen warnings, and all titles should be
  selectable on the place hold screen. A "Place hold" button should
  appear at the bottom.

- Some titles can be placed on hold, some cannot

  The titles which can be placed on hold should be selectable.
  Titles which cannot be placed on hold should show a warning
  message. A "Place hold" button should appear at the bottom.

- No titles can be placed on hold

  "Sorry, none of these items can be placed on hold." should appear at
  the top of the page. All titles should appear with warning messages.
  There should be no "Place hold" button.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10183' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:24:59 +0000 (08:24 -0400)]
Merge branch 'bug_10183' into 3.14-master

11 years agoBug 10183: Remove single pixel on the serials collection page
Jonathan Druart [Fri, 3 May 2013 12:37:46 +0000 (14:37 +0200)]
Bug 10183: Remove single pixel on the serials collection page

Test plan:
Go on the serials collection page
Check that the single pixels before and after the table have
disappeared.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pixels are removed, table functions work as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10176' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:22:39 +0000 (08:22 -0400)]
Merge branch 'bug_10176' into 3.14-master

11 years agoBug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE...
Karam Qubsi [Sat, 4 May 2013 20:44:57 +0000 (23:44 +0300)]
Bug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE symbols

I just add use utf8; to the Search.pm and the problem
was solved .

Test plan :
1- Add bib records with non-latin characters
2- search for some of these records
3- try to refine your search using Subject / Author

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work fixing URLs in facets. Now they work correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

I tested facets with the 22 Arabic records provided on
bug 9579 successfully. Before the patch the links are not
correct, after applying the patch the links work as
expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoComplete revert of 6554
Galen Charlton [Fri, 3 May 2013 14:58:50 +0000 (07:58 -0700)]
Complete revert of 6554

One line wasn't caught by the initial revert.  Thanks to
Jonathan Druart for catching this.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10084 - YUI path wrong in CCSR theme with packages
Tomas Cohen Arazi [Fri, 19 Apr 2013 18:14:17 +0000 (15:14 -0300)]
Bug 10084 - YUI path wrong in CCSR theme with packages

Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday).

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Worked fine in my test package, good work Tomas
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10150 - koha-email-disable error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 15:29:40 +0000 (12:29 -0300)]
Bug 10150 - koha-email-disable error handling

koha-email-disable now
- Checks the instance exists.
- Checks if email is already disabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoIncrement version for 3.12.0-beta3 release
Jared Camins-Esakov [Thu, 2 May 2013 03:06:54 +0000 (23:06 -0400)]
Increment version for 3.12.0-beta3 release

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd release notes for 3.12.0-beta3
Jared Camins-Esakov [Thu, 2 May 2013 03:04:49 +0000 (23:04 -0400)]
Add release notes for 3.12.0-beta3

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10044' into 3.14-master
Jared Camins-Esakov [Thu, 2 May 2013 02:58:41 +0000 (22:58 -0400)]
Merge branch 'bug_10044' into 3.14-master

11 years agoBug 10044: Remove duplicate pagination on the pending orders page.
Jonathan Druart [Fri, 26 Apr 2013 11:59:18 +0000 (13:59 +0200)]
Bug 10044: Remove duplicate pagination on the pending orders page.

Test plan:
Check that there is just one pagination on the pending orders page.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works and deletes the old pagination that was replaced by
datatables.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'deb_scripts_312beta3' into 3.14-master
Jared Camins-Esakov [Thu, 2 May 2013 02:28:32 +0000 (22:28 -0400)]
Merge branch 'deb_scripts_312beta3' into 3.14-master

11 years agoBug 9250 - Followup to add koha-*-sip commands to koha-common.xml
Magnus Enger [Tue, 5 Mar 2013 12:49:11 +0000 (13:49 +0100)]
Bug 9250 - Followup to add koha-*-sip commands to koha-common.xml

The original patch for Bug 9250 did not add the new commands to
debian/docs/koha-common.xml, which functions as a sort of table
of contents for the real commands. This patch adds them.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Simple documentation patch
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9250 - [SIGNED-OFF] provide commands to manage the SIP server
Robin Sheat [Mon, 10 Dec 2012 05:57:04 +0000 (18:57 +1300)]
Bug 9250 - [SIGNED-OFF] provide commands to manage the SIP server

This adds commands required to control the SIP server. These commands
are:
* koha-enable-sip - copies the SIP config to the sites directory
* koha-start-sip - starts the SIP server processes
* koha-stop-sip - stops the SIP server processes

It also calls these as appropriate from the koha-common init script.

To use:
1) sudo koha-enable-sip instancename
2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml
   Do whatever is needed for your site's SIP configuration
3) sudo koha-start-sip instancename

To test:
1) Build packages with this patch
2) Ensure that sudo koha-start-sip instancename doesn't do anything
3) Run sudo koha-enable-sip instancename
4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably
   not required for testing)
5) Run sudo koha-start-sip instancename
6) Note that the sip processes are now running
7) Run sudo koha-stop-sip instancename
8) Note that the sip processes have gone
9) Reboot your Koha server
10) Note that the sip processes are back

Sponsored-By: Waitaki District Council Libraries
Sponsored-By: South Taranaki District Council Libraries
Sponsored-By: Horowhenua District Council Libraries
Sponsored-By: Rangitikei District Council Libraries
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. koha-start-sip without a prior koha-enable-sip
does nothing. koha-enable-sip copies the SIP config file to the
instance directory. After koha-enable-sip, koha-start-sip and
koha-stop-sip works as expected. After a reboot, the SIP processes are
still running. I have not actually tested the SIP servers after they
have been started, but assume they work the same as always.
The man pages look good.

The new commands should also have been added to the man page for
koha-common. I'll do a followup for that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10041 - Provide a koha-translate script to aid package users on installing transl...
Tomas Cohen Arazi [Sun, 14 Apr 2013 00:10:33 +0000 (21:10 -0300)]
Bug 10041 - Provide a koha-translate script to aid package users on installing translations

Until we have solved the packaging of koha template translations, provide a command that manages the installed translations in a proper way.

To test, build a Debian package of current master+the patches from this bug :-D and try the many options running koha-translate --help provide.

The command itself can be grabbed from a git checkout with this patch applied to test the script's funcionality. If it (and its docs) fits the package building stuff, I'll test on monday when I can be back on my workstation.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Good adition. Work as described. No errors.
Copied to /usr/local/bin. No errors on install, update, remove, list and check.
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10101 - Follwup: fix param check
Tomas Cohen Arazi [Mon, 29 Apr 2013 18:18:17 +0000 (15:18 -0300)]
Bug 10101 - Follwup: fix param check

As Mason noted, there was an error on that line.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10101 - make koha-enable more robust
Tomas Cohen Arazi [Tue, 23 Apr 2013 14:03:44 +0000 (11:03 -0300)]
Bug 10101 - make koha-enable more robust

koha-enable now:

- checks for the existence of the instance before any other action on it.
- checks if the instance is already enabled before changing stuff in the config files.
- only reloads apache if it is needed!
- handles more than one instance name as parameter (the code was there, a check for the cardinality of the args prevented it from working).
- documents this behaviour change in the docs
- doesn't break if the provided (invalid) instance name is a prefix/suffix of a real one (added -x to the relevant grep command).

To test:
- Aplpy the patch, build your packages
- Run koha-enable on
  - Non existent instance (try using a prefix or a suffix of an already created one too).
  - Already enabled existent instance name.
  - Disabled instance.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10104 - Followup: fix param check
Tomas Cohen Arazi [Mon, 29 Apr 2013 18:22:09 +0000 (15:22 -0300)]
Bug 10104 - Followup: fix param check

As noted by Mason on bug 10101, the check was not working for zero arguments.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10104 - make koha-disable more robust
Tomas Cohen Arazi [Tue, 23 Apr 2013 16:29:02 +0000 (13:29 -0300)]
Bug 10104 - make koha-disable more robust

koha-disable now:

- checks for the existence of the instance before any actions on it.
- checks if the instance is already disabled before touching anything (warns otherwise)
- only reloads apache if needed
- handles more than one instance name.
- changed the docs to acknowledge the previous item.

To test:
- Apply the patch, build your package
- Run koha-disable on
  - Non existent instance (try names that are prefix and suffix of a valid one too please)
  - Already disabled instance name.
  - Enabled instance name.

It should work as expected and warn the user on the expected wrong cases.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10144 - koha-start-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 13:30:08 +0000 (10:30 -0300)]
Bug 10144 - koha-start-zebra error handling

koha-start-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10149 - koha-restart-zebra error handling (rewording)
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:54:27 +0000 (11:54 -0300)]
Bug 10149 - koha-restart-zebra error handling (rewording)

koha-restart-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Edit:
- changed some wording problems.
- fixed an error in parameter validation

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge remote branch 'origin/new/bug6554_reverts'
Galen Charlton [Wed, 1 May 2013 18:22:30 +0000 (11:22 -0700)]
Merge remote branch 'origin/new/bug6554_reverts'

11 years agoMerge branch 'bug_6506' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 12:44:16 +0000 (08:44 -0400)]
Merge branch 'bug_6506' into 3.14-master

11 years agoBug 6506: Correct CSS class name.
Peter Crellan Kelly [Tue, 9 Apr 2013 19:22:41 +0000 (07:22 +1200)]
Bug 6506: Correct CSS class name.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
http://bugs.koha-community.org/show_bug.cgi?id=6509
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 6506: When AnonymousPatron not set, deletion of issue history silently failed.
Peter Crellan Kelly [Thu, 28 Mar 2013 08:00:47 +0000 (21:00 +1300)]
Bug 6506: When AnonymousPatron not set, deletion of issue history silently failed.

Remedied by:
- in Circulation.pm changing AnonymiseIssueHistory so that it returns ($rows, $err_history_not_deleted) instead of $rows
- consequential change to misc/cronjobs/batch_anonymise.pl to handle updated return value, and fail if there is an error
- consequential change to tools/cleanborrowers.pl although this still fails silently (raised as bug 9944)
- update of opac-privacy.pl to check return value and pass on error
- update of opac-privacy.tt to display error if appropriate

Note bug 9942 remains unfixed, which is a similar issue upon issue return.

To test:
1. OPAC
- enable privacy mode (preference OpacPrivacy)
- leave anonymous patron set to zero (preference AnonymousPatron)
- attempt to delete user history
- observe error
- check history - still there
- change anonymous patron to a valid user
- attempt to delete user history
- observe success message
- check history - gone

2. cleanborrowers.pl
- test it functions as before.  bug 9944 has been raised for it continuing to silently fail.

3. batch_anonymise.pl
- enable privacy mode (preference OpacPrivacy)
- leave anonymous patron set to zero (preference AnonymousPatron)
- run script (I use --days -1 for testing)
- script should fail with a Carp message
- change anonymous patron to a valid user
- run script as before
- script returns quietly
- check history - gone

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 6506: Followup add warning in the system information tab.
Jonathan Druart [Tue, 9 Apr 2013 10:08:56 +0000 (12:08 +0200)]
Bug 6506: Followup add warning in the system information tab.

Add a warning in the system information tab of the about page.

Test plan:
Set OPACPrivacy = 1 and AnonymousPatron = 0 and go on the about page,
tab 'system information'. Check that the warning appears.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
http://bugs.koha-community.org/show_bug.cgi?id=6509
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7228' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 12:22:39 +0000 (08:22 -0400)]
Merge branch 'bug_7228' into 3.14-master

11 years agoBug 7228: can't add items in an order with Modify
Christophe Croullebois [Thu, 18 Apr 2013 10:55:18 +0000 (12:55 +0200)]
Bug 7228: can't add items in an order with Modify

We have a message if we want to add items and we can't add, substract only.
It's ok if we choose to create items on ordering, in this case koha can't add items, just substract
and in this case we have to delete manually the items(s) in the catalog.
But if via the syspref AcqCreateItem we choose to create items when receiving this limitation is not usefull
The patch just checks if the syspref AcqCreateItem is on 'ordering'
if not the message is not shown and we can add items

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Here is the test I made for signing off :
after applying the patch
- syspref AcqCreateItem  : create items on RECEIVING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on CATALOGING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on ORDERING
- in a basket, create an order (click on "add" to add an item => quantity = 1)
- save the order
- reopen the order
- try to change the quantity (2 instead of 1), without clicking on "add" to create a new item => you cannot (alert message)
=> the behavior is the same as before the patch

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copied test plan from bug report.
Template only change deactivating the Javascript that blocks
you from changing the quantity when AcqCreateItem is set to
something else than 'ordering'.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10033' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 12:17:06 +0000 (08:17 -0400)]
Merge branch 'bug_10033' into 3.14-master

11 years agoBug 10033 - dangerous query in _koha_modify_item
Fridolyn SOMERS [Fri, 12 Apr 2013 15:24:17 +0000 (17:24 +0200)]
Bug 10033 - dangerous query in _koha_modify_item

The SQL query build in C4::Items::_koha_modify_item performs an update on a row of items table identified by itemnumber.
Actually the query is build using a hash of datas :
    for my $key ( keys %$item ) {
        $query.="$key=?,";
        push @bind, $item->{$key};
    }
But this hash contains 'itemnumber' key, so you get an update including the primary key.
It is actually harmless but may be dangerous.

This patch simply skips itemnumber key in above loop.

Test plan :
Check you can create and modify items.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8419' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 12:15:00 +0000 (08:15 -0400)]
Merge branch 'bug_8419' into 3.14-master

11 years agoBug 8419 - Suspended holds appear on the daily holds queue
Kyle M Hall [Mon, 15 Apr 2013 12:39:26 +0000 (08:39 -0400)]
Bug 8419 - Suspended holds appear on the daily holds queue

This bug was reintroduced by the patch for bu 5911: Transport Cost Matrix

Test Plan:
1) Place a hold on a record
2) Run build_holds_queue.pl
3) Verify the hold is showing in the holds queue
4) Suspend the hold
5) Re-run build_holds_queue.pl
6) Note the hold is still in the holds queue
7) Apply patch
8) Re-run build_holds_queue.pl
9) Note the hold is no longer in the holds queue

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plan and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7368' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:58:41 +0000 (07:58 -0400)]
Merge branch 'bug_7368' into 3.14-master

11 years agoBug 7368: Small typo in history.txt
Marcel de Rooy [Mon, 29 Apr 2013 13:43:31 +0000 (15:43 +0200)]
Bug 7368: Small typo in history.txt

beomes becomes becomes :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes a typo in a text file, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8300' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:57:19 +0000 (07:57 -0400)]
Merge branch 'bug_8300' into 3.14-master

11 years agoBug 8300 - Add Test::WWW::Mechanize as an optional dependency
Magnus Enger [Wed, 20 Mar 2013 13:22:51 +0000 (14:22 +0100)]
Bug 8300 - Add Test::WWW::Mechanize as an optional dependency

This patch replaces an earlier patch by Marcel de Rooy, which
had become outdated because lots of new dependencies were
added since the patch was made.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8300: Add mechanized unit test for batch import
Jared Camins-Esakov [Sat, 23 Jun 2012 20:55:43 +0000 (16:55 -0400)]
Bug 8300: Add mechanized unit test for batch import

This new unit test confirms that importing records via the Stage
MARC import tool still works by connecting to a Koha instance and
importing a record then reverting the import, checking at each step
of the way that everything is as it should be.

To test:
1. Install Test::WWW::Mechanize
> sudo apt-get install libtest-www-mechanize-perl
2. Set environment variables to reflect your Koha instance:
> export KOHA_USER=kohaadmin
> export KOHA_PASS=katikoan
> export KOHA_INTRANET_URL=http://localhost:8080
> export KOHA_OPAC_URL=http://localhost
3. Run the test:
> prove t/db_dependent/www/batch.t

This updated patch now handles both MARC21 and UNIMARC installations.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
All tests pass with marcflavour = MARC21 and NORMARC. Test #15 fails
when marcflavour = UNIMARC, but from what I can see, that is because
I'm testing on a MARC21 setup, missing the UNIMARC frameworks etc.
I'm signing off - QA folks, please ask for a proper UNIMARC signoff
if you feel it is needed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Load the POSIX module (for the floor routine).
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7054' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:47:56 +0000 (07:47 -0400)]
Merge branch 'bug_7054' into 3.14-master

11 years agoBug 7054 - NORMARC: Fix default for 000 position 17
Magnus Enger [Mon, 15 Apr 2013 17:02:46 +0000 (19:02 +0200)]
Bug 7054 - NORMARC: Fix default for 000 position 17

Someone at the library education in Oslo told me that it would be
better to have the default for 000/17 set to 1, instead of 2 as it
is today.

To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
  the MARC dialect
- Go to Home > Cataloging > Add MARC record and start to add a new
  record
- Click in the 000 field and it should be filled with:
  "     nam a22     2  4500"
- Reload the page, then open the value builder for 000 and click on OK
- 000 should get filled with the same string as above

To test:
- Apply the patch and repeat the steps from above. The default value
  for 000 should now be:
  "     nam a22     1  4500"

(Don't be confused by the 1s and the 2s. A value of 1 in position 17
means "level 2", and a value of 2 means "level 1" - that is how it
is defined in the "standard":
1 = Nivå 2, iflg. Katalogiseringsregler
2 = Nivå 1, iflg. Katalogiseringsregler)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small changes. Didn't test in a NORMARC installaton, but
trusting Magnus with this and seeing no reason why it
shouldn't work.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7055' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:45:23 +0000 (07:45 -0400)]
Merge branch 'bug_7055' into 3.14-master

11 years agoBug 7055 - NORMARC: Fix 008 position 15-17 and 35-37
Magnus Enger [Mon, 15 Apr 2013 17:50:19 +0000 (19:50 +0200)]
Bug 7055 - NORMARC: Fix 008 position 15-17 and 35-37

This patch does several things:
- Set the default for 008/15-17 to "no " (yes, there is space at the end)
- Link from 008/15-17 in the value builder to NORMARC country codes
- Set the default for 008/35-37 to "nor" (by setting the
  DefaultLanguageField008 syspref)
- Link from 008/35-37 in the value builder to NORMARC language codes
- Fix a missing <tr> around field 35-37

To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
  the MARC flavour
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        xxu||||| |||| 00| 0 eng d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008. Problems:
  - The text for 15-17 links to MARC21 country codes
  - The default for 15-17 is xxu
  - The text for 35-37 links to MARC21 language codes
  - The default for 35-37 is eng
  - If you choose e.g. "Monografier" in the top dropdown then click
    on "OK" the window does not close

To test:
- Apply the patch and run through the Web-installer again, selecting
  Norwegian and NORMARC
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        no ||||| |||| 00| 0 nor d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008.
- Check that...
  - The default for 15-17 is "no " (with a space at the end)
  - The link goes to NORMARC country codes
  - The default for 35-37 is "nor"
  - The link goes to NORMARC language codes
- Select something from the top dropdown and click "OK". Check that the
  window closes and that the values that are entered into the 008 field
  matches what you chose in the popup window.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Trusing Magnus is right, so testing for any regressions mainly, all good

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only changes NORMARC specific plugin and system preferences
files. Changes all seem logical to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10053' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:37:30 +0000 (07:37 -0400)]
Merge branch 'bug_10053' into 3.14-master

11 years agoBug 10053: borrowers.branchcode cannot be null
Jonathan Druart [Mon, 15 Apr 2013 12:27:46 +0000 (14:27 +0200)]
Bug 10053: borrowers.branchcode cannot be null

The DB field borrowers.branchcode cannot be null (`branchcode`
varchar(10) NOT NULL default ''). However, an empty value can be selected
on creating/updating a patron.

Test plan:
- Add or edit a patron and choose the empty value for library
(branchcode).
- Save (pref BorrowerMandatoryField must not contain branchcode).
- Mysql raises an error.
- Apply the path.
- Check that you are not able to select no library.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10097' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:34:22 +0000 (07:34 -0400)]
Merge branch 'bug_10097' into 3.14-master

11 years agoBug 10097 - Hide framework selection when importing staged authority records
David Cook [Tue, 23 Apr 2013 02:58:19 +0000 (12:58 +1000)]
Bug 10097 - Hide framework selection when importing staged authority records

Currently, when importing authority records using the "Manage staged
MARC records" tool, it will show the text "Add new bibliographic records
into this framework:" followed by a drop-down menu of possible frameworks.

Since these are bibliographic frameworks and we're importing authority
records which do not use them, we have no need to show this information.

I'm proposing just a little patch to display this info only for
bibliographic records. From my tests, everything seems to work fine
without this text and the drop-down, although I've only uploaded one
MARC21 authority record at a time.

--

Test Plan:

Before applying patch...

1) Find yourself an authority record. I recommend downloading your
favourite author from: http://authorities.loc.gov/
2) Stage MARC for import. Choose "Authority" as your record type.
3) Go to "Manage staged records"
4) Underneath the button "Import this batch into the catalog", you
should see the text "Add new bibliographic records into this framework:"
followed by a drop-down of the available frameworks.

Optionally) You can also try this for bibliographic records. You'll find
the same.

After applying the patch...

5) Repeat steps 2 and 3.
6) Underneath the button "Import this batch into the catalog", you
should just see a table listing your MARC record(s).
7) Stage MARC for import. Choose "Bibliographic" as your record type.
8) Go to "Manage staged records".
9) You should find step 4 still to be true (i.e. the "Add new
bibliographic..." text should still be there).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9719' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:27:04 +0000 (07:27 -0400)]
Merge branch 'bug_9719' into 3.14-master

11 years agoBug 9719 - Changing the rows per page on a custom report fails if it has user supplie...
Kyle M Hall [Wed, 27 Feb 2013 13:46:56 +0000 (08:46 -0500)]
Bug 9719 - Changing the rows per page on a custom report fails if it has user supplied parameters

If you create an SQL report that includes one or more parameters,
using the 'rows per page' pulldown does not work. Instead, it will
prompt for the parameters again and shows the first page of output.

Test Plan:
1) Create a new report from sql as follows:
    SELECT * FROM borrowers WHERE surname LIKE <<Last Name>> AND firstname LIKE <<First Name>>
2) Run this report
3) Change the 'Rows per page' and click 'Update'
4) This should kick you back to the start where the report asks you for your parameters
5) Apply the patch
6) Repeat step 3, this time is should work correctly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely now. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9957' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:22:31 +0000 (07:22 -0400)]
Merge branch 'bug_9957' into 3.14-master

11 years agoBug 9957 - Missing cancel link on subfield editing page
Owen Leonard [Tue, 30 Apr 2013 18:39:48 +0000 (14:39 -0400)]
Bug 9957 - Missing cancel link on subfield editing page

The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.

The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.

To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, improves consistency and works
nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9266' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:19:26 +0000 (07:19 -0400)]
Merge branch 'bug_9266' into 3.14-master

11 years agoBug 9266 - Untranslated strings in tags moderation
Owen Leonard [Fri, 26 Apr 2013 18:20:49 +0000 (14:20 -0400)]
Bug 9266 - Untranslated strings in tags moderation

There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.

To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:

[ Approuvé ] [ Rejeter ]

Clicking the "Rejetee" button should change the state to:

[ Approuver ] [ Rejetée ]

Clicking "Approuver" should return the buttons to the first state.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7143' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:15:00 +0000 (07:15 -0400)]
Merge branch 'bug_7143' into 3.14-master

11 years agoBug 7143: Add missing contributor to about page
Jared Camins-Esakov [Wed, 1 May 2013 11:14:44 +0000 (07:14 -0400)]
Bug 7143: Add missing contributor to about page

11 years agoBug 7143: Updating the About page with translation teams for Basque and Turkish
D Ruth Bavousett [Tue, 22 Jan 2013 18:44:33 +0000 (15:44 -0300)]
Bug 7143: Updating the About page with translation teams for Basque and Turkish

Text-change only, should require little QA and testing.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7143 Followup for some new developers on about page
Marcel de Rooy [Mon, 29 Apr 2013 14:02:29 +0000 (16:02 +0200)]
Bug 7143 Followup for some new developers on about page

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only - changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10111' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 11:09:25 +0000 (07:09 -0400)]
Merge branch 'bug_10111' into 3.14-master

11 years agoBug 10111 - Layout on basket summary page a bit inconsistent
Owen Leonard [Thu, 25 Apr 2013 13:34:17 +0000 (09:34 -0400)]
Bug 10111 - Layout on basket summary page a bit inconsistent

Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.

To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_6709' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:55:44 +0000 (06:55 -0400)]
Merge branch 'bug_6709' into 3.14-master

11 years agoBug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
Bernardo Gonzalez Kriegel [Mon, 29 Apr 2013 16:07:11 +0000 (13:07 -0300)]
Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated

This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.

Xml processing is enabled in previous patch

Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.

NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.

NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.

NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js

To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.

Note: messed up patches, sending again.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.

Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 6709 : Patch for testing translating .xml files
Chris Cormack [Sun, 8 Apr 2012 08:10:19 +0000 (20:10 +1200)]
Bug 6709 : Patch for testing translating .xml files

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10143' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:47:52 +0000 (06:47 -0400)]
Merge branch 'bug_10143' into 3.14-master

11 years agoBug 10143 - Fixing license headers
Chris Cormack [Mon, 29 Apr 2013 10:31:58 +0000 (22:31 +1200)]
Bug 10143 - Fixing license headers

Some files have the old 59 Temple address instead of the 51 Franklin
street.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I see lots more which will need to be corrected as well.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects addresses in 3 files.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10022' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:44:26 +0000 (06:44 -0400)]
Merge branch 'bug_10022' into 3.14-master

11 years agoBug 10022 - Multiple tags moderation doesn't work on translated page
Fridolyn SOMERS [Wed, 10 Apr 2013 10:37:54 +0000 (12:37 +0200)]
Bug 10022 - Multiple tags moderation doesn't work on translated page

When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).

This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.

Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10017' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:39:45 +0000 (06:39 -0400)]
Merge branch 'bug_10017' into 3.14-master

11 years agoBug 10017: Follow up handling with the multi libraries pref active
Karam Qubsi [Wed, 17 Apr 2013 10:16:00 +0000 (13:16 +0300)]
Bug 10017: Follow up handling with the multi libraries pref active

This Follow up patch will handle multi libraries pref
when it sets to "add" and enhance the way lists drop down menu appear

 Test plan for all patches ( the first one and  all follow ups )  :
 1- apply the patches ( from the first one and all follow up patches)
 2- use 3.10 po files and update it (for the master) "
    ../misc/translate/ perl translate update ar-Arab "
 3- install Arabic from the updated po files
    "perl translate install ar-Arab "
 4- set opac opacthemes pref to ccsr
 5- set OpacAddMastheadLibraryPulldown pref to add
 6- select the Arabic from the opaclanguages pref
 7- set opaclanguagesdisplay  to allow
 8- go to the opac and choose  arabic
 9- you will see all the directions from right to left
    (as you look at koha on a mirror ;) ))

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as decribed. No errors.
With all patches applied, we get a pretty RTL interface.
Well done!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes are mostly CSS, one new image and a tiny template change.
Used po files from 3.8 for testing. Looks good!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10017: Follow up OPAC-CCSR-Right-to-left-css
Karam Qubsi [Tue, 16 Apr 2013 15:56:34 +0000 (18:56 +0300)]
Bug 10017:  Follow up OPAC-CCSR-Right-to-left-css

This follow up patch will delete the "-moz-box-sizing"
property that I was add when I'm doing some tests on
the rtl css file and  I forgot to delete it

many thanks David Cook for your notes deleting that property will not effect  on the results

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10017: Fix CSS for right-to-left in CCSR theme
Karam Qubsi [Mon, 8 Apr 2013 12:17:30 +0000 (15:17 +0300)]
Bug 10017: Fix CSS for right-to-left in CCSR theme

This patch will add css file for the Opac CCSR
link this css file in the doc-head-close.inc
and add new image : arrow-left-grey-11x6.png
for the opposite direction of the right existing one.

the test plan is the same for the oldest patches
for opac prog and intranet ...

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10083' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:33:38 +0000 (06:33 -0400)]
Merge branch 'bug_10083' into 3.14-master

11 years agoBug 10083 - In Transit string doesn't get translated in the staff interface
Owen Leonard [Fri, 26 Apr 2013 19:18:12 +0000 (15:18 -0400)]
Bug 10083 - In Transit string doesn't get translated in the staff interface

For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change fixing a translation problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10145' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:28:38 +0000 (06:28 -0400)]
Merge branch 'bug_10145' into 3.14-master

11 years agoBug 10145: The acquisition details block is badly placed.
Jonathan Druart [Mon, 29 Apr 2013 14:01:56 +0000 (16:01 +0200)]
Bug 10145: The acquisition details block is badly placed.

Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.

Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10152' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:25:58 +0000 (06:25 -0400)]
Merge branch 'bug_10152' into 3.14-master

11 years agoBug 10152: Default sorting wrong in parcels.pl
Jared Camins-Esakov [Mon, 29 Apr 2013 16:32:48 +0000 (12:32 -0400)]
Bug 10152: Default sorting wrong in parcels.pl

When you are receiving an order, the list of existing invoices should
appear in reverse chronological order. Unfortunately, right now it
appears in regular chronological order.

To test:
1) Make sure you have multiple invoices that have varying shipment
   dates for a vendor. We will assume this vendor is called "Example
   Vendor."
2) Choose the "Receive shipments" button on the Example Vendor page.
3) Note that the invoices are sorted by regular chronological order.
4) Apply patch.
5) Refresh "Receive shipment" page. Note that invoices are now sorted
   in reverse chronological order.
6) Sign off.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10153' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:23:46 +0000 (06:23 -0400)]
Merge branch 'bug_10153' into 3.14-master

11 years agoBug 10153 - Patron header search form is too wide
Owen Leonard [Mon, 29 Apr 2013 16:34:10 +0000 (12:34 -0400)]
Bug 10153 - Patron header search form is too wide

The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.

To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8264' into 3.14-master
Jared Camins-Esakov [Wed, 1 May 2013 10:21:40 +0000 (06:21 -0400)]
Merge branch 'bug_8264' into 3.14-master

11 years agoAdd Edmund Balnaves to history
Jared Camins-Esakov [Wed, 1 May 2013 10:20:00 +0000 (06:20 -0400)]
Add Edmund Balnaves to history

Welcome, Edmund. You are the 210th committer to Koha!

11 years agoBug 8264 - local cover images not working in IE8 [ prog ]
Edmund Balnaves [Mon, 15 Apr 2013 01:08:06 +0000 (11:08 +1000)]
Bug 8264 - local cover images not working in IE8 [ prog ]

[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.

It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.

This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...

It's certainly not the ideal solution, but it's a solution.

To Test:

Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
   with local images attached
2) Note that the local images appear in FF/Chrome/other,
   but not in IE

Apply patch.

After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
   as they should.

--

As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.

11 years agoRevert "Bug 6554 Followup for circulation patron search"
Galen Charlton [Mon, 29 Apr 2013 22:17:39 +0000 (15:17 -0700)]
Revert "Bug 6554 Followup for circulation patron search"

This reverts commit f257944d10c2660e7d7297768af314985c80a1c7.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 6554: Followup for preferences.pl"
Galen Charlton [Mon, 29 Apr 2013 22:17:31 +0000 (15:17 -0700)]
Revert "Bug 6554: Followup for preferences.pl"

This reverts commit c78b905811ed4869a4a69f60272e1b7787026f6e.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 6554: Followup for acquisitions"
Galen Charlton [Mon, 29 Apr 2013 22:17:24 +0000 (15:17 -0700)]
Revert "Bug 6554: Followup for acquisitions"

This reverts commit b2b003adea685acf3f590ed00baf7abec734341f.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 6554: Followup for serial search"
Galen Charlton [Mon, 29 Apr 2013 22:17:18 +0000 (15:17 -0700)]
Revert "Bug 6554: Followup for serial search"

This reverts commit c18cd930eb3d15e20c642b2788116cc2abb30538.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 6554 QA Followup"
Galen Charlton [Mon, 29 Apr 2013 22:17:06 +0000 (15:17 -0700)]
Revert "Bug 6554 QA Followup"

This reverts commit 686fdae32c2377b8748f71c534b5f32a2a83e850.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 6554 - make Koha internally utf-8 clean"
Galen Charlton [Mon, 29 Apr 2013 22:12:32 +0000 (15:12 -0700)]
Revert "Bug 6554 - make Koha internally utf-8 clean"

This reverts commit d542740ab8877234d043c8a11cb19a6004e72656.

Rolling back bug 6554 work until we have more comprehensive tests.

Conflicts:

opac/opac-search.pl

11 years agoRevert "Bug 6554 Fix error caused by modifying $_ in a map"
Galen Charlton [Mon, 29 Apr 2013 22:10:45 +0000 (15:10 -0700)]
Revert "Bug 6554 Fix error caused by modifying $_ in a map"

This reverts commit e98fe7e32244fa11d218b4d2a1006eea547e70d8.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 10074 - Encoding problems at login time"
Galen Charlton [Mon, 29 Apr 2013 22:10:23 +0000 (15:10 -0700)]
Revert "Bug 10074 - Encoding problems at login time"

This reverts commit 5805b5f363bd657d3dac6aeba225438bf80cae9b.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 10074 - Encoding problems for installer"
Galen Charlton [Mon, 29 Apr 2013 22:09:48 +0000 (15:09 -0700)]
Revert "Bug 10074 - Encoding problems for installer"

This reverts commit d0c6e09429d2af711f911b57601a02f17591d441.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 10074: QA Followup for InstallAuth.pm"
Galen Charlton [Mon, 29 Apr 2013 22:06:12 +0000 (15:06 -0700)]
Revert "Bug 10074: QA Followup for InstallAuth.pm"

This reverts commit e848d89e45d3e6610c3e9d246bd3672636dd63fb.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 10019: Fix for userid containing UTF8 chars"
Galen Charlton [Mon, 29 Apr 2013 22:05:22 +0000 (15:05 -0700)]
Revert "Bug 10019: Fix for userid containing UTF8 chars"

This reverts commit 7e90e1524f7e586dac0f98241ace430e5cbeac7f.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 9951: Followup for Tools"
Galen Charlton [Mon, 29 Apr 2013 22:04:38 +0000 (15:04 -0700)]
Revert "Bug 9951: Followup for Tools"

This reverts commit 252568aa8babdcc9508d3b3c7626543bfa648d99.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoRevert "Bug 9951: Followup for tools/viewlog.pl"
Galen Charlton [Mon, 29 Apr 2013 22:03:45 +0000 (15:03 -0700)]
Revert "Bug 9951: Followup for tools/viewlog.pl"

This reverts commit de7ba790fd2533bcf44ad7fd2f1255514ed9313c.

Rolling back bug 6554 work until we have more comprehensive tests.

11 years agoMerge branch 'bug_10088' into 3.14-master
Jared Camins-Esakov [Sat, 27 Apr 2013 12:23:34 +0000 (08:23 -0400)]
Merge branch 'bug_10088' into 3.14-master