Marc Véron [Mon, 20 Jun 2016 12:59:11 +0000 (14:59 +0200)]
Bug 10760: (followup) Move street type after address
As of comment #7
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9e1542eb84a0c8b02eae6ca3ff3616d0a5d412da) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 14 Jun 2016 08:57:52 +0000 (10:57 +0200)]
Bug 10760: Alternate Address: Display street number and street type
This patch displays alternate streetnumber and street type on patron's
detail page.
To test:
- Apply patch
- Verify that the alternate address information displays follwing the
setting in syspref AddressFormat and contains street type and
street number (as appropriate)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 03795b65d59d1e0bed9e6860e0309643b3bb13a6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 14 Jun 2016 08:14:29 +0000 (10:14 +0200)]
Bug 10760: Alternate Address: Make street number and street type editable
Table 'borrowers' contain columns B_streetnumber and B_streettype.
This patch makes them editable for alternate address.
To test:
- Apply patch
- Edit a patron's details
- Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear
and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField
- Verify that the values are saved correctly.
Note: A second patch will follow to manage the display of street number and street type Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3e576f65b2dff4616d8b57d8f31dea1a3a402ffc) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 6 Jul 2016 15:57:05 +0000 (16:57 +0100)]
Bug 9259: Use is instead of is_deeply
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit df57c8e864aefe0e90b49aa15fc95b6dcaafda7b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Tue, 29 Mar 2016 00:04:36 +0000 (00:04 +0000)]
Bug 9259: Ability to delete a staged file once it has been cleaned
To test:
1) Go to Tools -> Staged MARC Management and clean a file. If you have no files to clean, go to 'Stage MARC for import' and upload one to clean following the necessary steps.
2) Confirm that once the file has been cleaned, the Action column now shows a Delete button. Confirm this button only shows for cleaned files.
3) Click the Delete button.
4) Confirm that clicking Cancel exits the pop-up message and does not delete the file.
5) Confirm that clicking OK refreshes the list of staged records and the one you just deleted is no longer on it (has been deleted). You can confirm this by checking for the file in mysql (SELECT * FROM import_batches WHERE import_batch_id = X;)
6) Run prove -v t/db_dependent/ImportBatch.t (have written unit tests for CleanBatch and DeleteBatch)
Sponsored-by: Catalyst IT Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Catalyst sign off, so needs another one but YAY this is great.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 08e448ee4bfbd7a85dfbfd6d0d77f8d59dd93b8e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 7 Jul 2016 15:52:10 +0000 (16:52 +0100)]
Bug 16860: Remove the comment about the warning
It is no longer necessary.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c19f342bb1a8eaae25db979e94dc23efa4bc8a26) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
$ prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 3/24 attempting to use non-existent class sorting routine routine1
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24, 1 wallclock secs ( 0.02 usr 0.00 sys + 0.66 cusr 0.02 csys = 0.70 CPU)
Result: PASS
The above warning might be scary to those unfamiliar with the test.
Add a test to catch the warning.
TEST PLAN
---------
1) prove t/db_dependent/ClassSource.t
-- as above
2) apply patch
3) prove t/db_dependent/ClassSource.t
-- no message
4) prove -v t/db_dependent/ClassSource.t
-- test 13 is the new test
5) run koha qa test tools
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Workas as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b80318f1b7441328d818dfe67a4cb8cd345f585e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 7 Jul 2016 15:40:47 +0000 (16:40 +0100)]
Bug 16857: Check on item.branches makes more sense
The test should be on the existence of the item.branches
method/attribute
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f38bcf5505e1196c3ae4d2e9d5df523bb07ef281) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 4 Jul 2016 09:37:33 +0000 (11:37 +0200)]
Bug 16857 - patron-attr-types.tt: Get rid of warnings "Argument "" isn't numeric"
To vrify:
- Go to Home > Administration > Patron attribute types
- Make sure you have some patron attribute types with no branches limitation
- For each attribute type you get a warning in intranet-error.log:
patron-attr-types.pl: Argument "" isn't numeric in numeric gt (>) at (...)/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt line 284.
To test:
- Appy patch
- Verify that warnings no longer appear in intranet-error.log
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit abb7980004ad75de4a51d06815f5e98e1cbb0f6d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Magnus Enger [Tue, 28 Jun 2016 08:45:08 +0000 (10:45 +0200)]
Bug 16823 - Comment out koha-rebuild-zebra in koha-common.cron.d
Bug 16190 enabled the indexer daemon by default for package installations.
This means that it is no longer necessary to set up koha-rebuild-zebra as
a cron job. This patch comments it out, so that people who might run into
bug 16814 can easily activate the cronjob again after de-activating the
indexer daemon.
To test:
Just read the diff and check that it makes sense.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 666397446f1af6a5fb2f71ed590c55c2fc7d84d1) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Thu, 23 Jun 2016 16:35:24 +0000 (10:35 -0600)]
Bug 16803: Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
(Public and private lists)
To test:
-Apply patch
-Go to More -> Lists
-Create some Public and Private Lists
-See the contents of the list and notice about the new icons in
"Select/Clear all"
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3c80818f680278e595cf2a890b311db7866766a6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 22 Jun 2016 05:57:06 +0000 (07:57 +0200)]
Bug 16795 - Patron categories: Accept integers only for enrolment period and age limits
To test:
- Apply patch
- Clear browser cache
- Go to Home > Administration > Patron categories
- Create or edit a category
- Verify that field 'In months', 'Age required' and 'Upperage limit'
accept digits only
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e3002eea202a50b68e96650f37bcacc37843872e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sun, 3 Jul 2016 15:07:33 +0000 (16:07 +0100)]
Bug 16794: Group the 2 action buttons into the same column
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9b399a806100eb9568ae43d71b257f0801185072) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Wed, 22 Jun 2016 15:22:11 +0000 (09:22 -0600)]
Bug 16794: Revise layout for Admistration > Patron categories
Add Bootstrap buttons and Font Awesome Icons to "Delete" and "Edit" links
To test
- Go to Administration -> Patron categories
- Confirm that two button appear instead of links for "Edit" and "Delete"
- Edit an existing category and confirm that works as expected
- Delete a category and confirm that works properly.
Patch fix it according with QA comment 3
Fix copy and paste according with QA comment 6
Fix column "Default privacy" to be sorted again according with comment 8
Patch set squashed
Buttons appear now as requested in comment #3 (2 buttons, no action menu)
Re-tested, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a50eb52a425dbe8ec774e2664fe9df179d32ceaa) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Mon, 20 Jun 2016 19:12:22 +0000 (13:12 -0600)]
Bug 16781: Add Font Awesome Icons to "Select/Clear all" links to modborrows.tt and result.tt
Add Font Awesome Icons to "Select/Clear all" links to:
modborrows.tt (Batch patron modification) and result.tt (Search results)
To test:
-Apply on top bugs 16469 and 16494
-Goto Batch patron modification
-Create a new batch patron or select one patron list
-See the new icons for "Select all" and "Clear all"
-Do a search and see the new icons in Search results page
Followed test plan, icons display as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 68c0c94b94227a9d73456a50f08a735ee9746af7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Tue, 21 Jun 2016 21:19:40 +0000 (15:19 -0600)]
Bug 16793: Use Font Awesome for arrows instead of images in audio_alerts.tt
This changes fit with bug 16148 for marc modification template management
To test
-Apply patch
-Goto Admin->Audio alerts
-Verify that green arrows have disappeared now
in blue Awesome Icons
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
https://bugs.koha-community.org/show_bug.cgi?id=16794
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90da601783e9f368939d41affb250289dd10204b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 20 Jun 2016 13:27:39 +0000 (15:27 +0200)]
Bug 16779: Move road type after address in US style address formatting (main address)
To verify:
- Create a patron with address, streettype, streetnumber defined
- Set syspref 'AddressFormat' to US style
- Go to patron's detail page (in staff client)
- In main address, road type preceeds address (e.g. 25 Drive Euclid)
To test:
- Apply patch
- Refrexh patron's detail page
- Verify that main address displays correctly (e.g. 25 Euclid Drive)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eb77861750cb3a2720e4a3a8003d526fa7d61552) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Claire Gravely [Mon, 13 Jun 2016 22:25:03 +0000 (00:25 +0200)]
Bug 15929 - typo in explanation for MaxSearchResultsItemsPerRecordStatusCheck
There's a typo in the explanation for the new
MaxSearchResultsItemsPerRecordStatusCheck sys pref that was added in 3.22.2.
"If a record has more than this number of items, they availability statuses
..."
I have re-worded the description so it reads a bit better.
Test plan:
1. Check the description for syspref MaxSearchResultsItemsPerRecordStatusCheck.
2. Apply patch
3. Check syspref MaxSearchResultsItemsPerRecordStatusCheck description
to make sure it makes sense.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cae7e29cf27b3a751211dc71e1aeebe723153433) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mark Tompsett [Thu, 7 Jul 2016 06:34:28 +0000 (02:34 -0400)]
Bug 16869: Silence and catch warnings in t/db_dependent/SuggestionEngine_ExplodedTerms.t
By properly defining a opachtdocs (intranethtdocs was done too)
in the mock function, uninitialized variable warnings are
eliminated. Given that we can check if $KOHA_CONF is defined or
not, we can catch the warning as part of testing, so the output
of the test is cleaner.
TEST PLAN
---------
1) unset KOHA_CONF
2) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
-- lots of noise
3) apply patch
4) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
-- no noise
5) prove -v t/db_dependent/SuggestionEngine_ExplodedTerms.t
-- see the warnings were caught and not just ignored.
6) run koha qa test tools
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
No warnings. Works as advertised
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5ec641fbbb67501e2a71be64b12c9224caee1b55) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 19 Jun 2016 14:40:09 +0000 (16:40 +0200)]
Bug 16562 - Translatability: Issue in opac-user.tt (separated word 'item')
Alternate patch with wording as proposed in comment #12
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5f147cc6bb8a018fd0af8b23789e795bf57ede72) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick Clemens [Fri, 24 Jun 2016 16:04:43 +0000 (12:04 -0400)]
Bug 16807 - Use Koha::BiblioFrameworks instead of GetFrameWorkLoop
Refactor code to use work from 14889
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 10d4d2fd3139c74a1dcc0c643ca00be264e1a526) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick Clemens [Fri, 24 Jun 2016 13:57:07 +0000 (09:57 -0400)]
Bug 16807: Frameworks unordered in dropdown when adding/editing a biblio
To test:
Start to add or edit a biblio
Open the dropdown to change framework
Notice the order
Refresh the page - notice the order changes
Apply patch
Order is alphabetical
Refresh the page
Order does not change
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d17085ea0361f8581a796e5f17d0413b37b7b598) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 19 Jun 2016 15:43:19 +0000 (17:43 +0200)]
Bug 16774: Format date on 'Transfers to receive' page to dateformat system preference
To test:
- Apply patch
- Go to Home > Circulation > Transfers to receive
- Verify that in title (Transfer made to your library as of...) is
is formatted as defined in syspref dateformat
Additionaly, the patch changes page title and breadcrumb from:
Home > Circulation > Transfers to your library
to:
Home > Circulation > Transfers to receive
...to make them consistent with the link text on the Circulation home page
(Transfers to receive)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 11dc97cfae96676ff1cc242e8a43ad513c36c6ef) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Thu, 26 May 2016 13:35:26 +0000 (09:35 -0400)]
Bug 16600 - Remove some obsolete references to Greybox in some templates
This patch removes unused Greybox markup from two templates.
To test, apply the patch and go to Authorities.
- Perform an authority search which will return multiple results.
- Select two records to merge.
- On the "merging records" page, an earlier version used Greybox to show
a preview of the selected authority records. Confirm that authority
number link for the two records triggers a pop-up window instead.
- From the authorities home page, choose 'New from Z39.50'
- Perform a search which will return multiple results.
- Confirm that there is only a 'MARC' preview link. A
forever-commented-out 'Card' link has been removed.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Obsolete comment on 'Card' removed
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b6ccd8366dca9fc17d381d5fdf487bd8e2e1e045) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bug 15636 - DataTables Warning: Requested unknown parameter from opac-detail.tt
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch adds the same tests in the aoColumns DT definition than the
ones in the creation of the table. That's sound good.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a12d3d1bfa00499a0b16d39f01136050de537449) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Field callnumber should be itemcallnumber.
For completeness, prefixing the joined fields with items table prefix.
Note: You should expect Tools/Export to export only the items within a
given itemcallnumber range, but if the biblio has one item in that
range, the biblionumber is selected for export with ALL items. The script
is designed that way (first select biblio numbers based on criteria, and
run export with those biblio numbers).
Test plan:
[1] Select a biblio N with one item with say itemcallnumber X.
[2] Goto Tools/Export. Select biblio range N,N and no itemcallnumber
range. The biblio should be exported.
[3] Select biblio range N,N and itemcallnumber range A,B. No output.
[4] Select biblio range N,N and itemcallnumber range A,<empty>. Output.
[5] Select biblio range N,N and itemcallnumber range <empty>,X. Output.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 00960f196482bb8dda3ddac8d9361ca1ffc5af93) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick Clemens [Tue, 5 Jul 2016 18:49:35 +0000 (14:49 -0400)]
Bug 16855 - Poor performance due to high overhead of SQL call in export.pl
This patch eliminates all columns retrieved in the biblioitems query
except for biblionumber.
To test:
1 - Go to tools->Export data
2 - Export using various filters and note you get expected records
3 - Apply patch
4 - Ensure exported results match results before patch
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a44bb07b88ba9d5049a64f88610a8bb8e82efe3a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 4 Jul 2016 01:48:40 +0000 (03:48 +0200)]
Bug 16854: request.tt: Logic to display messages broken
This patch fixes broken logic in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
To verify, see initial comment.
To test:
- Apply patch
- Have a patron with a restricion and with outstanding fines
greater than defined in syspref 'maxoutstanding'
- Place a hold for this patron and verify, that messages
'Patron has restrictions' and 'Patron has outstanding fines...'
appear
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44092cbafd1641ef865497183b8368db83bb62a7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 24 Jun 2016 10:35:25 +0000 (10:35 +0000)]
Bug 16780 - Specify due date always sets time as AM when using 12 hour time format
This regression is occurs because the time format for the checkout
date/time widget is only meant to be given in 24 hour format. The time
due should not be converted to 12 hr time even if the library has 12
hour set as their preferred time format.
Test Plan:
1) Performat a backdated checkout with a date due that has a PM time
2) Note the date/time picker on the confirmition screen shows the time
in AM/PM
2) Note the time is not stored correctly
3) Apply this patch
4) Repeate step 1
5) Note the confirmation date/time picker now show the time in 24hr
format
6) Note the time was stored correctly
Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7c89f78f3bef1cdebb51dcb41fdda7a8dc252b94) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Fri, 17 Jun 2016 15:33:41 +0000 (11:33 -0400)]
Bug 16762: Record matching rules: Remove match check link removes too much
My patch for Bug 5006 introduced a lot of markup changes to the record
matching rules template. I missed a change in one are though, which
caused a bug with the way the 'Remove match check' link works.
To reproduce:
- Go to Administration -> Record matching rules.
- Edit a matching rule which includes at least one match check.
- Click a 'Remove match check' link. The entire "Required match checks"
block is removed.
To test, apply the patch and repeat the steps above. Clicking any
'Remove match check' link should remove only the corresponding rule.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ffcb360321f6abe111c3352606b4c641ac48950a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bug 16760: fix Circulation Statistics wizard under Plack
This patch fixes some variable scoping problems when running
the circulation statistics wizard under Plack. For example,
when using the item type as a row header, with this patch the
item type description is displayed rather than "UKNOWN VALUE".
This patch also enables warnings and fixes a couple variable
initialization issues. (Note that turning on warnings across
the board would make it easier to identify Plack variable scoping
issues, as "Variable "$foo" is not available at' errors would
be recorded in the Plack error log).
To test
-------
[1] Run the staff interface under Plack.
[2] Go to the Circulation Statistics Wizard and run a report
using item type as the row. Note that the row labels
display as "UNKNOWN VALUE" rather than the item type.
[3] Apply the patch and restart Plack.
[4] Run step #2 again; this time, the item type descriptions should
be used as the row labels.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8ca55a7fb37ac50103de978f82408776fc06b7bb) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Instead of relying on existing data, we use new TestBuilder recs.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c7596a489473bc294e04690f21b7a9d612f34abd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marcel de Rooy [Mon, 27 Jun 2016 07:24:14 +0000 (09:24 +0200)]
Bug 16671: [QA Follow-up] Add new itemtype and remove bailout
No need to bail out, if we are using TestBuilder.
Somehow, this test passes with me if we add a new record, and if
we do not, it fails (using BK as the first itemtype with notforloan
is 0).
Looking further, we should imo remove the Koha::ItemTypes searches
here and not depend on existing data. Just add some item types.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eddc0a0e0a72264151e39f8a5d87d638a4208369) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 6 Jun 2016 13:00:56 +0000 (14:00 +0100)]
Bug 16671: (bug 14828 follow-up) Pick the right itemtypes
Looking at commit aafe73eefb5151454fa8957bf188768324d23955
Bug 14828: Use Koha::ItemType[s] everywhere C4::ItemType was used
-my @item_types = C4::ItemType->all;
-my @for_loan = grep { $_->{notforloan} == 0 } @item_types
- or BAIL_OUT("No adequate itemtype");
-my $itemtype = $for_loan[0]->{itemtype};
+my $itemtype = Koha::ItemTypes->search({ notforloan => 1 })->next;
+$itemtype or BAIL_OUT("No adequate itemtype"); #FIXME Should be $itemtype = $itemtype->itemtype
It seems that the tests expect itemtypes for loan.
Test plan:
prove t/db_dependent/HoldsQueue.t
should still return green
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. No qa test tool errors
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Adding follow-up.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8f42c681b0208ace7ed7858cafdd8c9777debd96) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 6 May 2016 14:55:31 +0000 (15:55 +0100)]
Bug 16459: Add patron to a patron card requires catalogue permission
Currently, serials => 'routing' is required, which does not make any
sense.
It's a copy/paste error when this file has been created (you can blame
me).
Note that I am not sure catalogue is the correct permission, but it's
the one used almost everywhere in this module
Test plan:
Confirm that catalogue is enough to search for patrons to add to a
patron card.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3bb51d038639c7b197022a2c7c6ae864c834060f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 3 May 2016 13:34:33 +0000 (14:34 +0100)]
Bug 16431: Use Koha::Cache to cache marc subfield structure
The marc subfield structure is currently cached using a global variable
of C4::Context. The infos are retrieved every time a new context is
created.
This patch suggests to use Koha::Cache instead.
To achieve this goal, a new subroutine is created
C4::Biblio::GetMarcSubfieldStructure, it will be called from code which
needs to get the marc subfield structure. GetMarcFromKohaField,
GetMarcSubfieldStructureFromKohaField, TransformKohaToMarc and
_get_inverted_marc_field_map are modified accordingly and the cache is cleared
when the table is updated (from the 3 pl scripts modified by this patch).
The caching done in C4::Context (marcfromkohafield) is removed.
Test plan:
Play with the marc subfield structure (in the administration module),
then add and edit records and make sure everything went fine.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Everything works as expected on my functional tests. I'm really happy to see the
patch introduces relevant tests for previously untested functions.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 172ebfe520d34f8106ec011b7d707c0560d65760) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Lyon3 Team [Tue, 6 Oct 2015 13:42:15 +0000 (15:42 +0200)]
Bug 14968 - found shouldn't be set to null when cancelling holds
Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr> Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 83328c1061af0ae82d8a2086e298375875e2dfa9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Morgane Alonso [Mon, 6 Jun 2016 12:24:56 +0000 (12:24 +0000)]
Bug 12509 - Fix Untranslatable Restriction added by overdues process
Changes the value of the "comment" column in "borrower_debarments" table
from "Restriction added by overdues process yyyy-mm-dd hh:mm:ss" to
"OVERDUE_PROCESS yyyy-mm-dd hh:mm:ss" in the overdue_notices.pl. Then in
the templates "moremember.tt", "circulation.tt", "memberentrygen.tt",
"opac-reserve.tt" and "opac-user.tt" the value of "comment" is
check, if it's an automatical comment due to overdue process it'll
write "Restriction added by overdues process yyyy-mm-dd hh:mm:ss",
then if there is a customizable comment it will be written without
modification. Like this, the comment "Restriction added by overdues
process" is written in the po files and can be translated later.
To test:
1) create a patron with automatical restriction due to overdue process;
2) apply patch;
3) run misc/cronjobs/overdue_notices.pl;
4) verify if the comment "Restriction added by overdues process" is well
written and translatable on the following page :
- opac patron home page (opac-user.tt);
- opac item reservation page (opac-reserve.tt);
- pro patron page (moremember.tt);
- reservation item for a patron (circulation.tt, memberentrygen.tt);
5) try to translate the comment in po files;
6) sign off.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a1285ba9c0f9a7020ba5f6e982dd2a5891ab9f63) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 19 Jun 2016 16:10:06 +0000 (18:10 +0200)]
Bug 16772 - Change label from 'For:' to 'Library:' to ease translation
This patch changes the label from "For:" to "Library:" in the
acquisition information filter on the suggestions page in staff client.
To test:
- Apply patch
- Go to Home > Acquisitions > Suggestions management
- Verify that label reads as appropriate (in filter
Acquisition information)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4747e6155efc9902003ae3ae4c14535fc7ece015) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 21 Jun 2016 11:36:38 +0000 (12:36 +0100)]
Bug 16770: Remove 2 other occurrences of libmemoize-memcached-perl
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 735789d71aa802385b282c79edad43d2a6fb58d6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sat, 18 Jun 2016 14:22:35 +0000 (15:22 +0100)]
Bug 16770: Remove Memoize::Memcached dependency
This module is no longer in use and can be removed.
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
This part involves some changes in a bunch of mysterious debian|ubuntu
related files, not quite sure if I know what I'm doing Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 67e6efab5d2da2c55d138153060c70cba342db7e)
Jonathan Druart [Sat, 18 Jun 2016 14:21:28 +0000 (15:21 +0100)]
Bug 16770: Remove wrong caching of 3 subroutines in C4::Lancuages
ooking at this code, you might think these subroutines are cached, but
actually they are not.
The eval surrounding the code hides a bug, if you remove it, you will
get:
Invalid memcached argument (expected a hash)
Test plan:
Do not apply this patch and confirm that the code does not work
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44fb6e72254391d38b7a66fa395bb9874a6d716c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Wed, 15 Jun 2016 12:21:26 +0000 (12:21 +0000)]
Bug 16745 - Add edit catalog and edit items links to serials toolbar
It would be very helpful for librarians to have links directly to the
record and items editor from a serial. Right now moving from the serial
to those editors requires jumping through a number of pages.
Test Plan:
1) Apply this patch
2) Browse subscription-detail.pl for a given serial
3) Under the Edit button, note the "Edit record" link
4) Verify the link takes you to the marc editor for that record
5) Create or find a serial that is set to create items on receiving
6) Under the Edit button, note the new "Edit items" link
7) Verify the link takes you to the items editor for that record
8) Create of find a serial that is *not* set to create items on receiving
9) Verify the "Edit items" link does not exists for that serial
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit db52dfed0168a5a120d07e4599af688269162461) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick Clemens [Mon, 6 Jun 2016 15:28:39 +0000 (11:28 -0400)]
Bug 16651: Notes field blank for 952$z in opac-course-details.pl
This patch changes course reserves to check for item notes form the
course reserve and fallback to itemlevel notes if they are empty
To test:
1 - Enabvle course reserves
2 - Add some items
3 - Make sure the items have notes at the item level and not at course
reserves
4 - Notes don't display in staff or opac
5 - Apply patch
6 - Notes display in staff and opac
7 - Add notes at course reserves level
8 - These override the item level notes
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 62508428cdf3a4c3da975ef5f88c8ece9cf50537) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Wed, 11 May 2016 12:56:15 +0000 (08:56 -0400)]
Bug 16602 - Remove the use of "onclick" from several templates
This patch removes the use of "onclick" from several templates, instead
defining click events in JavaScript.
Also changed: Some markup corrections.
To test, apply the patch and:
- Go to Circulation -> Upload offline circulation file
- Browse for an offline circulation file.
- Clicking the 'Upload file' button should work correctly.
- After uploading a file, both the 'Add to offline circulation
queue' and 'Apply directly' buttons should work to trigger their
corresponding processes (keeping Bug 16603 in mind).
- Go to Patrons -> Patron lists.
- For any patron list containing patrons, click the 'Print patron
cards' menu item. This should trigger a modal window which exports
the correct list.
- Go to Tools -> Batch item modification.
- Submit a batch of items for modification.
- Clicking the 'Save' button should trigger the background job and the
items should be successfully modified.
- Go to Tools -> Batch item deletion.
- Submit a batch of items for deletion.
- Clicking the 'Delete' button should trigger the background job and
the items should be successfully deleted.
- Go to Tools -> Calendar.
- Trigger the 'Add new holiday' panel by clicking a day on the
calendar which has no holiday defined.
- Clicking the 'Cancel' link should hide the panel.
- Trigger the 'Edit this holiday' panel by clicking a day which has a
holiday defined.
- Clicking the 'Cancel' link should hide the panel.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Everything works as previously.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 458ce34a1dbfff9a5c5a696560ffdc5b8afa041a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Zeno Tajoli [Thu, 26 May 2016 13:34:56 +0000 (15:34 +0200)]
Bug 16601: Update of italian MARC21 files
This is the update for April 2016 changes of Library of Congress
The basic creation of the files is done in http://translate.koha-community.org/files/it/mandatory/
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Both files load without problems.
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 718a0a7d143a1291021836b570e597cb564fa7c2) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Thu, 19 May 2016 13:41:24 +0000 (09:41 -0400)]
Bug 16557 - Remove the use of "onclick" from several include files
This patch modifies several include files, removing "onclick" attributes
in favor of defining events in JavaScript.
A reusable "toggle" function has been added to the global JS file so
that clicking elements with the class "toggle_element" will toggle the
display of elements as defined in the click target's "data-element"
attribute.
Also changed: In subtypes_unimarc.inc some capitalization errors have
been fixed and label/id pairs corrected.
To test, apply the patch and clear your browser cache if necessary.
- On the Acquisitions home page, click the "Orders search" header search
tab. Clicking the [+] link should expand and collapse the additional
search fields.
- On the checkout or patron detail page, view the "Restrictions" tab.
Click to add a restriction and use the datepicker to select a date.
Clicking the "Clear date" link should clear the date.
- Trigger the help window on any page. Clicking the "close window"
button should work correctly.
- Go to Administration -> Patron categories -> Edit. Checking and
unchecking messaging preference options should work correctly. The "do
not notify" checkbox should clear other checkboxes in that row and
vice versa.
- In Serials, from a subscription detail page, clicking the "Renew"
button should trigger the renew popup.
- Go to Acquisitions -> Vendor -> Add to basket -> From a subscription.
Clicking the "Advanced search" link in the left hand sidebar should
toggle the sidebar search form.
- In a UNIMARC system, view the advanced search page. Clicking the "Show
coded information filters" link should show additional search fields.
(I tested in my MARC21 system by temporarily moving line 174 of
advsearch.tt to line 172).
Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0c476f15082893cb2ee66271009fb09d3f698c23) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Thu, 19 May 2016 01:23:14 +0000 (21:23 -0400)]
Bug 16549 - Remove the use of "onclick" from header search forms
This patch removes the use of "onclick" from all header search forms for
the purpose of triggering the "keep_text" function. This behavior is now
handled in the globally-included JS file.
To test, apply the patch and clear your cache if necessary.
- Enter text in any header search form field. Click to each other tab
in the header and confirm that your text is copied to each.
- Test the behavior of the header search form on at least one page where
each is included:
- The staff client home page
- The advanced search page
- The authorities home page
- The administration home page
- The cataloging home page
- The checkin page
- The circulation home page
- The patrons home page
- Acquisitions -> Vendor -> Contracts
- Administration -> Cities
- Administration -> Currencies and exchange rates
- Administration -> Patron categories
- Administration -> Printers (why is this page still around?)
- Administration -> System preferences
- Administration -> Z39.50/SRU servers
- Tools -> Notices & slips
This patch modifies does not fix the existing (unreported) bug which
prevents the keep text function from working in the include file used on
these pages:
- Acquisitions -> Vendor -> Basket -> New order from suggestion
- Administration -> Budgets
- The serials home page
Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6524e6d95726c70b7ff6088b31692216a1956110) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Fri, 13 May 2016 13:59:53 +0000 (09:59 -0400)]
Bug 16513 - Improvements and fixes for quote upload process
This patch fixes some minor bugs and adds a small enhancement to the
quotes editor and quotes upload pages.
To test, apply the patch and go to Tools -> Quote editor
- In the table of quotes, clicking the "ID" table header should trigger
an alert, "Click on the quote's ide to select..."
- Go to "Import quotes" and select a file to upload.
- On the upload preview page you should see a new "Cancel import"
button. Clicking it should return you to the quotes upload page after
asking for confirmation.
- Test the upload cancel button:
- If you have fast reflexes or are uploading a file large enough, you
should be able to see a "Cancel upload" button during the upload
process.
- Clicking this button should cancel the upload and return you to the
quote upload page.
Tested on top of Bug 16589, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90a1d98e068e38e1c0655d608d98d7d88f344429) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Tue, 10 May 2016 18:56:14 +0000 (14:56 -0400)]
Bug 16494 - Remove the use of "onclick" from some patron pages
This patch removes the use of "onclick" attributes from some patron
pages.
To test, apply the patch and:
- In Patrons, perform any search which will return multiple results.
Confirm that the "select all" and "clear all" links work as expected.
Font Awesome icons have been added to these links.
In the left-hand sidebar, change any of the filters and click the
"Clear" button. The form (and your search results) should reset.
- Open the 'Set permissions' page for any patron. Checking any
permission with sub-permissions should correctly expand the tree and
select all sub-permissions. The reverse should also work.
Also changed in this file: The "Inconsistency detected" alert has been
reformatted to make it translatable.
- View the detail page for a patron with one or more restrictions.
Clicking the "View restrictions" link at the top of the page should
jump you to and activate the restrictions tab.
- View the 'Notices' tab for a patron who has been sent one or more
notices. Click any notice title to expand the notice. Clicking the
"resend" button should resend the notice.
- Create a new patron with the same first and last name as an existing
patron. This should trigger a duplicate warning message. Click the
"View existing record" link to trigger a pop-up window with a patron
detail brief view.
In this window an "email" class has been added to the primary and
secondary email lines so that long email addresses don't overlap the
second column of data.
Confirm that clicking the "close" button in this window closes the
window. The changes to staff-global.css are included in this patch to
prevent the close button from having an incorrect color change on
hover.
Signed-off-by: FILIPPOS KOLOVOS <f.kolovos@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0336f32b6592fa4a714eeb9c217bf7150e2fc90f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sat, 18 Jun 2016 15:39:45 +0000 (16:39 +0100)]
Bug 16490: Tidy updateLink and updateAllLinks
Went through test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f9282eca291e44da795cc62bc8ff5593107c5cb5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Tue, 10 May 2016 01:14:17 +0000 (21:14 -0400)]
Bug 16490 - Add an "add to cart" link for each search results in the staff client
This patch adds an "add to cart" link to each line of search results in
the staff client.
To test, apply the patch and clear your browser cache if necessary.
- Enable the intranetbookbag system preference.
- Perform a search which will return multiple search results.
- Each result should have an "Add to cart" link.
- Clicking the "Add to cart" link should add the title to the cart,
triggering the correct pop-up message and changing the link to read
"In your cart (remove)."
- Clicking the "remove" link should remove the title from your cart
and trigger the correct messages.
- Add multiple titles to your cart and perform the same search again.
Each result should correctly indicate which titles are already in your
cart.
- Open the cart popup window.
- Check the checkbox for one or more titles in your cart and choose
"Remove." The titles should be removed, and the "In your cart" label
in the search results page should reflect that the titles are no
longer in the cart.
- Choose "Empty and close." All titles in the parent page should now
indicate that they are not in the cart.
- Disable the intranetbookbag preference and confirm that the "Add to
cart" links are no longer there.
Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 480a445991b587f6bf8573861d113159c0fd4a3b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Mon, 9 May 2016 15:15:28 +0000 (11:15 -0400)]
Bug 16477 - Improve staff client cart JavaScript and template
This patch makes several changes to the cart JavaScript and template. In
the template:
- Remove "onclick" attributes in favor of defining events in the
JavaScript.
- Add a [% BLOCK %] section for some repeated markup.
- Add some Font Awesome icons (I didn't add icons to all controls
because I thought it looked cluttered).
- Move the batch modification control out of the toolbar and into the
group of controls which affects selected records. I think this is a
logical grouping, and makes more sense than having a drop-down menu in
the toolbar with a single menu item.
JavaScript:
- Created separate "cart.js" file so that JS could be moved out of the
template without loading up basket.js with event functions which are
not needed on every page in the staff client.
- Fix JSHint errors.
To test, apply the patch and clear your browser cache if necessary.
- Add multiple items to the cart in the staff client and open the cart.
- Confirm correct functionality of these toolbar buttons:
- "More details" (and the corresponding "Show less")
- "Send"
- "Print"
- "Empty and close"
- Confirm the correct functionality of all the selection controls:
Select all, clear all, Remove, Add to a list, Place hold, Batch
modify, and Batch delete.
- Confirm that clicking any title in the cart opens the correct detail
page in the parent window.
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
https://bugs.koha-community.org/show_bug.cgi?id=1647
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 24729ff8f99e3e96cb5fd1b3cd9af0616cc38e55) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
To test:
1) Start with a fresh database
2) Check mandatory bibliographic and authority files
load without problem using the German web installer
3) Check new fields/subfields are ok
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Not a german speaker but seems right :)
File loads without problem.
No errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7a3b5ee04b801a5d7bfaf190c6cbc5bb53359fff) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Fri, 6 May 2016 15:40:00 +0000 (11:40 -0400)]
Bug 16469 - Remove the use of "onclick" from some catalog pages
This patch removes the use of "onclick" attributes from two
catalog-related templates: The local cover image viewer and the search
results page. Events are now defined in JavaScript.
To test:
On the search results page:
- Perform a catalog search which will return multiple results.
- On the search results page, confirm that the "Select all" and "Clear
all" links at the top of the results table work correctly.
In the local cover image viewer:
- The LocalCoverImages and AllowMultipleCovers system preferences must
enabled, and at least one catalog record must have at least two local
cover images attached.
- Locate that record in the catalog and view the detail page for it.
- Click the cover image in the "Images" tab to go to the image viewer
page.
- Clicking each local cover image thumnail should correctly display the
larger version of each image.
Signed-off-by: Nikos Chatzakis, Afrodite Malliari <nchatzakis@datascouting.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9cb7244433cf446232cfcc8a22f333cdcd8db1db) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Mon, 16 May 2016 18:01:34 +0000 (14:01 -0400)]
Bug 16400 [Follow-up] Proposal to uniform the placement of submit buttons
This follow-up makes some corrections to the markup of the cancel
button:
- Use <a> instead of <button> to eliminate the need for an "onclick"
attribute.
- Remove the "cancel" class which adds unwanted padding.
- Correct the destination of the cancel button when cancelling during an
edit (should redirect to the patron detail page).
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b77bd31fbf9c3a1b1feaa29a61e9d0805a1dec2d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 16 May 2016 10:56:04 +0000 (11:56 +0100)]
Bug 16400: Use the fa-times icon for Cancel
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f9d239dabad5459bf08dbf135f57d8186ff11e3c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 13 May 2016 14:04:47 +0000 (15:04 +0100)]
Bug 16400: Restore the previous stack order behavior
When updating the plugin, the stack order behavior has changed. This
patch restores the prevous behavior (not always z-index: 1000)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 82dbf05f542d7bc9cf5c8607b0ecf182b8c2c076) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 3 May 2016 14:03:38 +0000 (15:03 +0100)]
Bug 16400: Reintroduce the floating class
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3fe6398c22cd578af99bba6d821a01e6ca5193fe) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 29 Apr 2016 18:01:10 +0000 (19:01 +0100)]
Bug 16400: Let's hack the fixFloat plugin to fix our needs
On comment bug 11088 comment 2, Owen explained the problem with the
fixFloat toolbar. Since we have a hidden div, the plugin does not manage
to place the toolbar correctly.
In order to make it work, this patch adds some changes to the plugin to
add the ability to define our own offset.
When the div is extended (+, filteraction_on), the offset should be
updated to move the toolbar. Same when the div is folded (-,
filteraction_off)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c1f101e86c717ceaccf781de0f1c05dc23c8272a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 29 Apr 2016 17:17:01 +0000 (18:17 +0100)]
Bug 16400: Update the fixFloat plugin
I have updated it just in case it fixed the issue.
I don't think there are big changes between our current version and this
one, so keep it up-to-date
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0d6ff551741ee3f9242b1a4e917376817771d5d0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marcel de Rooy [Thu, 16 Jun 2016 11:03:30 +0000 (13:03 +0200)]
Bug 16751: What is sitemaper?
s/sitemaper/sitemapper/
Test plan:
Run t/db_dependent/Sitemapper.t
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3e566de51fe6f2e966158f97682f9a5aaecab974) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Delete extra useless comment line:
"# if its a subject we need to use the subject.tt"
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4f80ab223adc8bb3145a921153c578219e91f5d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Tue, 14 Jun 2016 15:05:58 +0000 (17:05 +0200)]
Bug 16736 - Keep branch filter when changing suggestion
When changing suggestion, the selected tab is kept.
The same should be done with the selected branch.
Test plan:
- Go to suggestions table : /cgi-bin/koha/suggestion/suggestion.pl
- Select a branch in Acquisition information > For
- Select a pending suggestion
- Change status as accepted
- Click on Submit
=> without patch, the table is no longer filtered by branch
=> with patch, the table is filtered by branch
Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0c1fa2f93c30a363b8b6cf9eaf2a93979b61adf9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marcel de Rooy [Fri, 3 Jun 2016 09:31:44 +0000 (11:31 +0200)]
Bug 16644: Plack: Use to_app to remove warning about Plack::App::CGIBin instance
Using Plack with the debian psgi file, I get lots of warnings like:
WARNING: Automatically converting Plack::App::CGIBin instance to a PSGI code reference. If you see this warning for each request, you probably need to explicitly call to_app() i.e. Plack::App::CGIBin->new(...)->to_app in your PSGI file.
This patch is aimed to eliminate the warns.
Test plan:
Run Plack with plack.psgi or koha.psgi and verify if you do not see these
warnings anymore.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
I tested on Jessie and I see no regressions.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d69d874a3f749687c2ff9a8d2a400378dfc94ff6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Wed, 25 May 2016 15:57:25 +0000 (11:57 -0400)]
Bug 16462 - Change default sorting of circulation patron search results to patron name
This patch changes the default sort of patron quick search results from
the circulation header search or when searching for a patron during the
hold process.
To test:
In Circulation:
- Perform a search by name for a patron which will
return multiple search results.
- Confirm that the results are sorted by patron name.
In the catalog:
- Locate and place a hold on a title.
- When prompted to select a patron to place the hold for, perform a
search by name which will return multiple results.
- Confirm that the results are sorted by patron name.
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 38d1a1862dcc26e284953fd383150816a183a7d5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Tue, 14 Jun 2016 18:05:53 +0000 (18:05 +0000)]
Bug 16737 - Error when deleting EDIFACT message
If you try to delete an EDIFACT message it triggers an error:
Can't use string ("2") as a subroutine ref while "strict refs" in use at
/acqui/edifactmsgs.pl line 43.
Test Plan:
1) Attempt to delete an EDIFACT message
2) Note the error
3) Apply this patch
4) Attempt to delete an EDIFACT message again
5) Note it succeeds
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1f2dcfd2e93dc444cc92e62cd8be2dbb29f7cb08) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick Clemens [Wed, 22 Jun 2016 15:06:10 +0000 (11:06 -0400)]
Bug 16708 - (QA followup) Fix pod copy/paste error
Change Koha::Authority to Koha::MetadataRecord::Authority
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4491780ecc53eba9f038da786060927197e0ecad) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 10 Jun 2016 13:23:08 +0000 (14:23 +0100)]
Bug 16708: Fix authority reindex for ElasticSearch
The changes made to Koha::Authority has not been correctly fixed.
The code of Koha::Authority has been moved bo
Koha::MetadataRecord::Authority by bug 15380.
Test plan:
perl misc/search_tools/rebuild_elastic_search.pl -a -v
should success
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1e39ecc7f15f493f96bb1e65e9791e5a9ea320d8) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
NguyenDuyTinh [Fri, 10 Jun 2016 10:14:12 +0000 (10:14 +0000)]
Bug 16705 - Add missing status to serials history in OPAC
The bug is related to 10851. Due to add of status in 10851, status added were
missing in opac-detail.tt and opac-full-serial-issues.tt. The patch just added
these missing status.
To test:
1) Create New subscription in Serials, in Intranet
2) Do a search of the new subscription by Title
3) Take Serial receive as Actions to edit the status to Missing (<something>)
4) Go to Opac and Search the subscription created, by its title and See missing status
5) Apply patch, status must be showed.
6) Sign off
Followed test plan, works as expected.
Amended to format commit title and message. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e1d6974bff1cc7290d792a4e6ac81e7d32b0c375) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 7 Jun 2016 11:02:06 +0000 (12:02 +0100)]
Bug 16624: Fix regression displaying a letter with hours
Bug 13622 has introduced a bug, if pref TimeFormat is 12hr and a date is
displayed in both title and content of the letter.
Test plan:
1 - Checkout an item (with default time 11:59:00 PM)
2 - Generate a quickslip
3 - Notice the time is 'AM'
4 - Apply patch
5 - Generate quickslip
6 - Note time is correct
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6f0ce92543319d243cf185e3df9f91a9cf7f6d87) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 7 Jun 2016 11:00:59 +0000 (12:00 +0100)]
Bug 16624: Add regression tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 47e41ea1c28a2aa265950e0645e402a3ac4c39d8) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 27 May 2016 14:12:20 +0000 (14:12 +0000)]
Bug 16612 - Cannot set "Until date" for "Enrollment period" for Patron Categories
Attempting to set an "Until date" date for "Enrollment period" will
result in the date being accepted but not saved.
Test Plan:
1) Attempt to set an enrollment period until date for a new patron category
2) Note the period is not saved
3) Apply this patch
4) Attempt to set the enrollment period date again
5) This time it should save!
Signed-off-by: Andrew Brenza <abrenza@audubonlibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2af028bb13273d2b13f6e5cf417436fc0c8764f7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sat, 11 Jun 2016 14:27:04 +0000 (15:27 +0100)]
Bug 16707: Fix software error in OPAC password recovery when leaving form fields empty
The $search_results is considered as an arrayref but is not defined if
no patron matches the recovery infos.
Test plan:
- Set syspref OpacResetPassword to "Allow"
- Go to OPAC
- Click link "Forgot your password?
- On the following screen "Forgotten password recovery", do not fill in
form fields, click "Submit"
=> Without this patch you got the software error
=> With this patch apply, you will get "No account was found with the
provided information."
Sign-off on counter patch. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0d690ca383f49d62b1b040004e960596e1a39b2d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 7 Jun 2016 09:45:35 +0000 (10:45 +0100)]
Bug 16680: (bug 13918 follow-up) Display library names for holds in transit
Regression introduced by bug 13918: the library names are not displayed
anymore for holds in transit.
They are 2 warns in the logs:
No method wbrname! at
/home/koha/src/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
line 603.
No method wbrcd! at
/home/koha/src/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
line 603.
Test plan:
Make sure you have holds in transit and go the opac-user.pl
In the "Holds" tab, you should see "Item in transit to LIBRARY NAME"
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 574bff5c6f2472eda5da58eeec84018abe4e4711) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 26 May 2016 10:52:19 +0000 (11:52 +0100)]
Bug 16593: Do not allow patrons to delete search history of others patrons
A malicious user can delete the search history of all other users by
correctly guessing the ID value assigned to the victim's search. As
searches are assigned values sequentially, an attacker could quickly
remove the searches belonging to all of the application's users.
To reproduce:
Login with patron A
launch a search
Note the id generated for this search history:
select id from search_history order by id desc limit 1;
Login with patron B
Hit /cgi-bin/koha/opac-search-history.pl?action=delete&id=<ID>
Note that the row is deleted in the DB
Test plan
Confirm that this patch fixes the issue.
The same test can be made at the staff interface
Reported by Alex Middleton at Dionach
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f01720808a574af9872ef3f562a8f3cee7f81060) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sat, 21 May 2016 08:10:46 +0000 (09:10 +0100)]
Bug 16527: Restore sticky due date behavior
Bug 10067 has introduced a regression on the sticky due date behavior:
If "remember for session" is checked and the due date is changed from 1
checkout to another, the old due date will be used.
The code added by bug 10067 is really confusing and it's hard to say
this patch won't introduce another regression.
The manipulation of $restoreduedatespec, $duedatespec and $stickyduedate
is not easy to follow.
Test plan:
Confirm that the regression is fixed and that this patch will not
introduced a regression on bug 10067 (good luck!)
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 33f1354b7b50390b43e5a2f66e1abe58817e6d4d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 17 Jun 2016 16:29:33 +0000 (16:29 +0000)]
Bug 16534: (followup) - Tidy AddIssue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f1fa65f6375b73b8e2aff3139885971f08bb27a3) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 23 May 2016 05:48:10 +0000 (07:48 +0200)]
Bug 16534: (followup) Correct tiny typo
This patch corrects "...must be return..." to "must be returned..."
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fe02c9fdf0550caf0b9a7e0f4b1138260c94abc9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sun, 22 May 2016 09:01:56 +0000 (10:01 +0100)]
Bug 16534: Block AddIssue from issuing if the return is not possible
To make sure the return can be done, AddIssue must not trust callers (they
should have done their job, but we are not sure) and check that the issue can
be returned before issuing to the patron.
There is no test plan here, this should not be possible from the Koha
interface.
However, looking at the code, it may be possible using SIP.
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1a9674fd3a8d8c898d8dc208d6e3d0296daeca40) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sun, 22 May 2016 09:03:11 +0000 (10:03 +0100)]
Bug 16534: Add tests for AddIssue
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a879efb574028be78f0706f36bd5e1e11d54dfc2) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sun, 22 May 2016 09:01:48 +0000 (10:01 +0100)]
Bug 16534: Make CanBookBeIssued test if the issue can be returned
If an issue is already checked out, CanBookBeIssued must check if the
issue can be checked in before processing the return.
In such cases (depending of the AllowReturnToBranch pref), the issue
should not be allowed.
Prior to this patch, the checkin was not done and the checkout failed
with "Duplicate entry '1204321' for key 'itemnumber'". Indeed since bug
14978, there is an uniq key on issues.itemnumber. Before bug 14978 the
issue existed but was hidden (and some weird behaviors certainly
happened!).
To avoid Koha to crash, a check is added to CanBookBeIssued (call to
CanBookBeReturned) and the librarian is not able to process the
checkout.
Test plan:
- Set AllowReturnToBranch to anywhere
- Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
- Check the item out from Library 2
=> Confirm the checkout (should work with and without this patch)
- Set AllowReturnToBranch to holdinbranch ("only the library the item
was checked out from").
- Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
- Check the item out from Library 2
=> Without this patch, Koha crashed
=> With this patch, you will be warned that the checkin is not possible.
Try other combinations of the AllowReturnToBranch syspref
Followed test plan, works as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9427d44568e6d52fde3960bda3ad957ca6a5b7fe) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Sun, 22 May 2016 09:02:44 +0000 (10:02 +0100)]
Bug 16534: Add tests for CanBookBeIssued & AllowReturnToBranch
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2c88538946e05feb65aa5b0f9007882a0ce6ac73) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Thu, 16 Jun 2016 07:27:55 +0000 (09:27 +0200)]
Bug 16747 - Patron card creator broken with version 16.05
To reproduce:
- Prepare a patron car layout with Image 1 using Patron Image
- Create a patron card for a patron without patron image
Result: OK, PDF can be opened wit PDF viewer
- Try to create a patron card with a patron who has a patron image
Result: The PDF file is corrupt (contains text only with error message)
intranet error log contains: create-pdf.pl: Illegal division
by zero at /usr/share/kohaclone/patroncards/create-pdf.pl line 200
To test:
- Apply patch
- Create a patron card with a patron who has a patron image
Result: PDF is OK and contains the image
Bonus test: Do the same with a card layout with an additional image
(Image 2: Image source: Other image)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Test and bonus test pass: PDF generated without errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 87dbed0abd67e88ae85f633d9f4c63c38a2f7e24) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 14 Jun 2016 05:07:05 +0000 (07:07 +0200)]
Bug 16729: Use member-display-address-style*-includes when printing user summary
This patch replaces the address part in moremember-print.tt to print identical
address information as displayed on the screen (including street numer, formatted as required by syspref 'AddressFormat'
To test:
- Apply patch
- Search for a user with all address information filled
- Verify that 'Print summmary' displays the same information
as displayed on the screen.
- Change value of syspref 'AdressFormat'
- Verify that address format on 'Print summary' changes
as appropriate
Signed-off-by: mehdi <mehdi@inlibro.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 555f40626ab34eccadec66091e54e203a9be4440) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Wed, 25 May 2016 14:49:26 +0000 (10:49 -0400)]
Bug 16543 - Make edit and delete links styled buttons in patron attribute types administration
This patch modifies the Patron attribute types page, converting edit and
delete links to Bootstrap buttons with Font Awesome icons.
To test, apply the patch and go to Administration -> Patron attribute
types. The 'Edit' and 'Delete' buttons should look correct and work
correctly.
Signed-off-by: Jan Kissig <jkissig@th-wildau.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ae4be45444dd8e6a65dc7170cfc43c60de328f38) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 14 Jun 2016 10:09:42 +0000 (11:09 +0100)]
Bug 16456: Reintroduce wording "Delete tag"
"Delete tag" seems more appropriate than "Delete" on this tag, but I may
be wrong.
This patch also removes an extra space.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 45fbcb9fda8776dc78556efd99076ce8fc8b4f97) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Sat, 14 May 2016 05:40:25 +0000 (23:40 -0600)]
Bug 16456: Add Font Awesome icons to some buttons in Tools module, section Patrons and circulation
Add Font Awesome Icons to section Patrons and circulation in Tools module.
Also correct a error dialog in JQuery functions
To test:
-Apply patch
-Goto Tools -> Patron list -> my_list_saved -> Add patrons -> Remove selected patrons,
Clear all, Select all.
-Add new patron list and add some patrons, notice about the trash icon.
-Make some comments in some bib records and goto Tools->Comments
you will presented with two tabs "Approved comments" and
"Comments awaiting moderation".
See the three new buttons: Approve, Delete, Unapprove.
-Set syspref TagsModeration to Require. This will show all pending tags to review.
-Make some tags in bib records and goto Tools -> Tags.
-Notice about the new look.
-In the new screen look the icons in buttons "Apply filter(s)", "Test", "Approved",
"Reject". Notice about the new header bar above the DataTable with options: Select all,
Clear all, Select all pending.
-Play with filters; Check if terms exist or not in appoved/rejected lists
-Play with Terms summary and see if DataTable is working as expected
-Click in some term tag with multiple titles
-A table with titles tagged with the term is presented
-See the new button 'Remove'
-Verify if you can remove tag from a selected title.
-Verify that all tools work as expected
NOTE: The Tag and Comments tools has been revised to fit with others
interfaces in Koha.
Bug ammended according with QA comment 5
Bug rebased because bug 16005
Test plan amended for clarity
Clock icon for "Select all pending" removed (QA comment 23).
Fix some forbidden patterns (tab char) in review.tt according by IRC comment
by Marc Veron
Followed test plan, looks and works as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2a6a3de7c407724d2778be8bf422b1222910e4a7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Tue, 31 May 2016 14:08:03 +0000 (10:08 -0400)]
Bug 16127 - Add discharge menu item to patron toolbar
This patch changes the "Discharge" menu in the patron sidebar to read
"Discharges," and adds a "Discharge" menu item to the patron toolbar.
This adds some redunancy, but fits with the pattern of including "views"
in the sidebar and "actions" in the menu. The discharge feature can be
thought of either way.
To test you must have the 'useDischarge' system preference enabled.
- View the detail page for any patron.
- Confirm that the sidebar menu reads "Discharges."
- Confirm that the "More" menu contains a "Discharge" link which works
correctly.
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 981302a47322857b080107a71c47db2345ef5286) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
projects / koha.git / log