Commit graph

10683 commits

Author SHA1 Message Date
4a0deff529 Bug 15319 - Use Bootstrap modal for MARC preview when performing batch record modifications
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the batch record modification page so that the
"Preview MARC" link triggers a preview in a Bootstrap modal.

To test:

1. Apply the patch and navigate to Tools -> Batch record modification.
2. Submit multiple biblionumbers for batch modification.
3. In the results list, click the "Preview MARC" link for multiple
   results and confirm that the correct data is shown each time.
4. Use the "Modify record using the following template" menu to change
   the modification template.
5. Confirm that the "Preview MARC" links still work and show data
   correctly modified by your newly chosen template.
6. Repeat steps 2-5 with authority record numbers.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Works as described. No regression.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 14:47:51 +00:00
23c7de2bc7 Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.

To test:

1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
   modal is triggered showing the correct data.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Modal looks much better. Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 14:37:32 +00:00
Marc Véron
976d715ac5 Bug 15386: Checkout / patron pages: Hide menu items leading to 404 pages
Some of the menu items on patron / Checkout related pages lead to a 404 page
depending on the permissions. This patch hides them as appropriate.

To test:

- For a staff member A, set permission 'borrowers' only (+ 'catalogue')
- Log in as A
- Search a patron and display details
- Verify that none of the menu items at the left lead to the 404 page

- For a staff member B, set permission 'circulate_remaining_permission'
  only (+ catalogue)
- Log in as B
- Go to Circulation > Checkout, search a patron
- Click menu items at the left, some of them lead to the 404 page
- Verify that none of the menu items at the left lead to the 404 page

- Do the same for a staff member C with both permissions set
- Verify that menu items appear as expected

Signed-off-by: Lucio Moraes <lmoraes@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: I have remove the double if
CAN_user_circulate_circulate_remaining_permissions statement (and group
block into one). And also remove unecessary change ('IF a IF b' instead
of existing 'IF a && b')

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 13:10:10 +00:00
dcc10787cc Bug 15309 - Use Bootstrap modal for cataloging search MARC and Card preview
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones. This
patch modifies the cataloging search results page so that "MARC" and
"Card" previews are displayed in Bootstrap modals.

To test:

1. Apply the patch and navigate to Cataloging.
2. Perform a search which will return results from the catalog.
3. Test the "MARC" and "Card" links for multiple results and confirm
   that the correct data is shown each time.
4. Perform a search which will return results from the reservoir.
5. Test the corresonding "MARC" and "Card" links for those results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 12:51:16 +00:00
2d0d717301 Bug 14636: Item search - biblioitems column is publicationyear not publicationdate
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow-up!

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 12:44:26 +00:00
Katrin Fischer
2aa6518c8a Bug 14636: Item search - improving display
- Changes "Publication Date" to "Publication date"
  in the CSV export
- Fixes 'no JavaScript fallback' display to match
  the normal display
  - only show 'by' when it's UNIMARC and an author
    exist
  - show copyrightdate if publicationyear is empty

To test:
- Turn of Javascript in your browser before you
  item search. This will activate the alternative
  display.
- For MARC21:
  - Verify that the author displays when existing
    and no 'by' is shown.
  - Verify that the publication date is now shown.
- For UNIMARC:
  - Verify that 'by' only displays when there is
    an author to display.
  - Verify that the publication date is still
    shown.
- Try the CSV export.
- Verify that the CSV header now reads 'Publication date'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Successfully tested non-JS behavior and CSV export. DID NOT test
UNIMARC.

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 12:44:26 +00:00
010a32d95f Bug 15344: Remove some other calls of GetMemberDetails from pl scripts
Same as previously.
For these files it's a bit less obvious.
To make sure these changes won't introduce any regression, check that
the variable returned by GetMember is never used to get something
else than a borrower fields.
The 'flags' should not be get neither.
For opac-user.tt it's different, other keys are got but there are defined
in the pl script.

On the way:
- 'showname' is removed (never used)
- fix scope var issue in opac-user.tt (BORROWER_INF.OPACPatronDetails vs
OPACPatronDetails)

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>
2015-12-30 11:53:18 +00:00
ac541e0fa1 Bug 15344: Remove unucessary call to GetMemberDetails
This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.

To test this patch you should have technical skills to know what to do.

Note that USER_INFO was an array of... 1 element. Now it's a hashref.

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>
2015-12-30 11:53:18 +00:00
940010b2bd Bug 11747 - Add system preference DefaultToLoggedInLibraryOverdueTriggers
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: INSERT IGNORE INTO + msg

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:47:41 +00:00
Jonathan Druart
10480c406c Bug 11625: Implement DefaultToLoggedInLibraryNoticesSlips
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:41:14 +00:00
651ba2bac3 Bug 11625 - Add system preferences DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips
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>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: INSERT IGNORE INTO + msg

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:41:13 +00:00
Gaetan Boisson
4d96477544 BUG 14991 Improve consistency of authority search
At the moment we can search authorities from two places: authorities-home.pl and auth_finder.pl (while cataloguing).

The auth_finder.pl page offers searching specifically in the $a of the main heading, while the authorities home page doesn't.

Additionally, the wording and order of the options is different.

authorities-home.pl has:
Search main heading
Search all headings
Keyword search

while auth_finder.pl has:
Main entry ($a only)
Main entry
Anywhere
Heading match

This patch will add some consistency so that both pages offer:
Search main heading ($a only)
Search main heading
Search all headings
Search entire record

Test plan:

- apply patch
- go to authorities home
- check that previous searches are still working
- check that the new ($a only) search is working
- go to auth finder (from cataloguing)
- check that searches are still working
- check that we do have the same wording in both pages and that forms are now consistent

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 04:29:04 +00:00
Marc Véron
1acc6094be Bug 14948 - Display amounts right aligned in tables on patron pages
This patch set display amounts for charge, fine, price etc. right aligned in tables
on patron pages.

To test, apply patch and verify that amounts appear right aligned on following pages:

- Go to Home > Patrons, perform a search (Column 'Fines')
- Go to a patron with fines and credits
  - Checkout tab (circulation.pl): Columns 'Charge', 'Fine', 'Price'
    (maybe you have to show column with 'Show / hide colums')
  - Fines Tab > Pay fines (pay.pl): Columns 'Amount', 'Amount Outstanding'
  - Fines Tab > Account (boraccount.pl): Columns 'Amount', 'Outstanding'
    Note: Test here 'Filter paid transactions' as well

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 04:25:51 +00:00
65c5fa4385 Bug 15210 - Novelist throws an error if no ISBN
This patch makes opac-detail.tt check for an ISBN before attempting to load Novelist content and prevents a js error which breaks other code.

To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function() {$("body").css("background-color","pink");});
3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error in the console
5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:54:33 +00:00
Hector Castro
7d16555427 Bug 15170 - Add 264 field to MARC21*DC.xsl
Modify MARC21*DC.xsl to add RDA 264 field

To test:
- Copy from LOC z39.50 the Maxwell's handbook for RDA (ISBN
  9780838911723)
- Look the field 264 in framework, save record
- Open this URL in OPAC

  /cgi-bin/koha/unapi?id=koha:biblionumber:41201&format=marcxml

  And play with id (the number of new record for Maxwell book) &
  format parameters
  Test format=rdfdc, format=srw_dc and format=oai_dc
- Notice that <dc:publisher> and <dc:date> are not present
- Apply this patch
- Reload the URL for the three formats
- You will see the tags publisher and date are taken from 264

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:49:27 +00:00
cd46c5dc75 Bug 15324: Do not display 'Waiting holds:" if no holds are waiting
Test plan:
- Make sure that you have a patron A with waiting holds and a patron B
  without waiting holds
- Go to the checkout page for patron A (Home > Circulation > Checkouts
> ...)
- At the right, there is a title "Waiting holds:" and a list of
  holds waiting
- Go to the checkout page for patron B
=> Without this patch "Waiting holds:" is displayed

Sign-off on Jonathan's patch
Signed-off-by: Marc Véron <veron@veron.ch>

http://bugs.koha-community.org/show_bug.cgi?id=14324

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:41:33 +00:00
83b7d6e0d3 Bug 15314: Use Bootstrap modal for cataloging merge MARC preview
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the cataloging merge selection page so that the
MARC preview is shown in a Boostrap modal. This patch also changes the
preview link to be the text "View MARC" so that it is clear what it
does.

To test:

1. Apply the patch and navigate to Cataloging.
2. Perform a search which will return results from the catalog.
3. Select two records and click the "Merge selected" button to begin the
   merge process.
4. Test the "View MARC" link for both merge choices and confirm that the
   correct data is shown each time.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:38:15 +00:00
0ca5c7ea4f Bug 15313 - Use Bootstrap modal for z39.50 search MARC and Card preview
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the cataloging Z39.50 search results page so that
"MARC" and "Card" previews are displayed in Bootstrap modals.

Because the modal is triggered from a pop-up window, the modal has been
reformated to exclude the footer and reduce the size of the modal
header.

To test:

1. Apply the patch and navigate to Cataloging.
2. Click the "New from Z39.50/SRU button to open the search
   window.
3. Perform any search which will return results.
4. Test the visible "MARC" and "Card" links for multiple results and
   confirm that the correct data is shown each time.
5. Click anywhere in the results table to show the hidden menu and test
   the "MARC" and "Card" links it displays.

Corrected: The original patch didn't address the hidden menu which
appears if you click in any table cell.

Followed test plan, works as expected (including click in table cell).
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:31:28 +00:00
8814330439 Bug 15289 [QA Followup] - Fix minor language issue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:51:50 +00:00
Alex Arnaud
eb5fca30aa Bug 15289 - borrowers permission allows to see patron's loans
Test plan:

 - log with a user that have "borrowers" permission but not "Remaining circulation permissions"
 - go to a borrower's detail page (who has at least a loan) and click on "show checkouts"
 - check that you see loan(s) and that you can't renew and checkin

 - Do the same with a borrower that have "Remaining circulation permissions"
 - check that you see loan(s) and that you can renew and checkin

Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:51:50 +00:00
Hector Castro
e89714ea84 Bug 15228: Switch "Items in batch number"
Yet another line to switch "Items in batch number" to
"Patrons in batch number"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:20:43 +00:00
Katrin Fischer
5782da035f Bug 15228: Patron card batches - Improve translatability
This patch removes the \n\n from a translatable string
as those don't translate correctly to new lines.

It also switches 'item' for 'patron' to avoid confusion
with catalog items.

To test:
1) Trigger changed error message
- Create a new batch with 1 patron entry
- Select patron in list using the checkbox
- Click 'Remove selected patrons' in toolbar
- Verify alert displays correctly

2) Verify that the page no longer uses "items" but
   patrons instead.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:20:42 +00:00
d36280e36e Bug 15101: Correct typo AllowPkiAuth vs AllowPKIAuth
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:17:45 +00:00
Katrin Fischer
cee796629f Bug 15101: Don't display sys pref AllowPkiAuth under CAS heading
The system preference AllowPkiAuth display under the heading
CAS authentication, but is actually a separate authentication
option. Patch creates a separate heading for it.

To test:
- Go to Administration > System preferences > Tab Administration
- Verify that AllowPkiAuth is now displayed separately

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:17:44 +00:00
acf586a45a Bug 15229: Same fix for circulation.tt template (normal checkouts)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:04:46 +00:00
Katrin Fischer
59e2b4e105 Bug 15229: Fix tiny typos in error messages of batch checkout page
Patch fixes some small spelling errors on the batch checkouts
page. Also switches 'reserves' to 'holds'.

To test:
- Read the patch and verify that the changes are correct.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Changes are correct, patch fixes capitalization and typo

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 02:04:46 +00:00
Katrin Fischer
d9c78c9a65 Bug 15224: Label creator - fix tiny typo 'itemnunber'
To test:
- Go to Tools > Label creator > New > Label batch
- Check text displayed in grey next to the text input
  field

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 01:57:30 +00:00
Nicole C. Engard
391c8ec0bc Bug 15220: Fix typo in circ rules help
MaxFinesystem should be MaxFine system

To test:

* visit circ & fine rules
* click help
* confirm typo fixed

Signed-off-by: Thomas Misilo <misilot@fit.edu>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 01:54:46 +00:00
Marc Véron
29a4300c07 Bug 15238: Better translatability for Installer Step 1
This Bug streamlines html in installer/step1.tt for better translatibility.

To test:
Reviwe code and verify that changes in text make sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
To reproduce in Debian environment, remove a required module with
dpkg -r. Rewording Ok for translation purposes

Bug 15238: (followup) Remove word 'Note:'

'Note: ' removed as requested in comment #3

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Word 'Note' removed

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 00:33:45 +00:00
Marc Véron
b0e833f9f5 Bug 15237: Quote of the day: Better translatibility for editor and help
This patch moves  html markup out of explanatory text in Quote of the day editor and help
for better translatibility (Home > Tools > Quote Editor).

To test:
- Apply patch
- Go to Home > Tools > Quote Editor and related Help
- Verify that text changes make sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Make consistent space after "Note:" (inside the br tag)

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 23:57:52 +00:00
Marc Véron
f9586b0199 Bug 15236: Better translatibility in "Connect biblio.biblionumber to a MARC subfield"
This patch moves html markup out of explanatory sentence in koha2marclinks.tt ("Connect
biblio.biblionumber to a MARC subfield") for better translatability.

To test:

- Apply patch
- Go to Home > Administration < Koha to MARC mapping
  and edit a tag
- Verify that text change makes sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 23:29:56 +00:00
Marc Véron
8f77dc86ce Bug 15233: (followup) Remove 2 sentences.
This patch removes 2 sentences (see comment #8)

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 23:14:39 +00:00
Marc Véron
9b0d9a186a Bug 15233: Cataloging subfield editors: Clean up html and streamline text for better translatability
This patch removes bold markup from explanatory text in auth_subfields_structure.tt
and makes it the same as in marc_subfields_structure.tt for better translatibility.

To test:
- Apply patch
- Verify that string changes make sense and that the explanatory text is the same in both files.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 23:14:38 +00:00
Marc Véron
36c0658329 Bug 15232: Advanced Cataloging Editor: Fix translation issues
This patch makes
koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc to comply with
Coding guidlines to avoid translation issues: "JS3: Avoid strings which
mix text and markup Text mustn't contain HTML tags."

To test:
- Apply patch
- Verify that code changes are correct (html markup moved out of
  function _(...) )
- Bonus test: Enable syspref 'EnableAdvancedCatalogingEditor' and verify
  that it works as before

With type fix from: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 22:56:16 +00:00
Marc Véron
ea0d5aa6bf Bug 15231: (followup) Remove stray </b> tag
This patch removes a stray </b> tag (see comment #4) and a superfluous blank.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 22:45:57 +00:00
Marc Véron
5843c76546 Bug 15231 - Import patrons: Remove string splitting by html tags to avoid weird translations
Some of the strings in Home > Tools > Import patrons contain html tags and therefore are
splitted in the translation tool. This makes it nearly impossible to create correct translations
from the partial strings.
Additinally, the notes for Extended patron attributes never displayed (due to a bug).

To test:
- Apply patch
- Enable Syspref 'ExtendedPAtronAttributes'
- Go to Home > Tools > Import patrons and verify, that the Notes at the right of the
  screen make sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Split html tags removed, notes at right side it displayed correctly

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 22:45:57 +00:00
Marc Véron
466eebe9e5 Bug 15301: branchtransfers.tt: Remove ambiguous "To" and fix splitted sentence
The file intranet-tmpl/prog/en/modules/circ/branchtransfers.tt contains two
ambiguous words 'to' and a sentence splitted up by html tags, leading to weird
translations. Example in German: "Sie können keine Exemplare aus itemtype
transferieren BK für: Airfield"

To test:
- Apply patch

- Set up transfer policies for item types and collection codes in
  Home > Administration > Set library checkin and transfer policy
  Make sure that you have rules that deny and others that allow transfers

- Verify that syspref 'UseBranchTransferLimits' is set to 'Enforce'

- Set 'BranchTransferLimitTypes' to 'item type'

- Go to Home > Circulation > Transfers
- Transfer an item that is allowed for item type
  - Verify that the table of transferred items displays information
    about Item type, Collection code and Destination

- Transfer an item that is not allowed for the item type
  - Verify that the information about not allowing the transfer displays
    properly and is meaningfull

- Set 'BranchTransferLimitTypes' to 'collection code'

- Repeat the transfer steps above for allowed / not allowed collection code

(Amended to add ids to table and 8 columns, see comment #2)
(Amended for comment #5)
Followup for comment #8

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 21:24:50 +00:00
Marc Véron
b075135269 Bug 15300: Translatability: Replace ambiguous 'From' and 'To' in members-update.tt
This patch replaces semantically ambigous words "From" and "To" in
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
for better translatability.

To test:
- Apply patch
- Make sure that patrons can request detail changes in OPAC
  (sysprefs opacuserlogin, OPACPatronDetails)
- Log in to OPAC, request a change of personal details
  (cgi-bin/koha/opac-memberentry.pl)
- Log in to staff client
- Click link 'Patrons requesting modifications' or go to
  Home > Patrons > Update patron records
- Verify that table headers make sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purpose

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 21:18:40 +00:00
Marc Véron
639ccd469f Bug 15366 - Fix breadcrumbs and html page title in guided reports
This patch fixes following issues with breadcrumbs and html page title
in Home > Reports > Guided reports wizard:

- Sometimes, breadcrumbs display a stray > at the end

- While creating a report, steps are not displayed in breadcrumbs and
  do not appear in html page title
- html page title is divided by newlines

To test:
- Apply patch
- Go to Home > Reports > Guided reports wizard
- Go to all pages including the steps for creating a new report and
  verify
  - that the breadcrumbs display properly and make sense
  - in html source, the page title makes sense and displays on one line.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:44:08 +00:00
Marc Véron
bc2e4ba862 Bug 15365: Translatability: Fix issue on Administration > Circulation and fine rules
Fix translatability issue on smart-rules.tt to prevent odd translations (Sentences
splitted by tags and newlines).

To test:
- Apply patch
- Go to Administration > Circulation and fine rules
- Verify that the lines "Note: " and "Important: " below "Default holds policy by
  item type" make sense and are not splitted by tags and (in html) by newlines.

(Amended to fix commit message)

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
strong Note and Important displayed Ok for translation purpose

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:38:17 +00:00
Marc Véron
27363271be Bug 15363: Translatability: Fix issue with ambiguous 'all' on Administration > Set library checkin and transfer policy
In branch_transfer_limits.tt, set ambiguous word 'all' (separated by tags) into a
translatable context.

To test:
Apply patch
- Go to Home > Administration > Set library checkin and transfer policy
- Verify that the word 'all' is no longer separated by tags
  in "For all collection codes: " rsp. "For all item types: "
  (Switch with syspref 'BranchTransfersLimitsType')

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works well for translation purpose

Bug 15363: (followup) Move tags inside if statements

Followup for comment #3

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:35:49 +00:00
Marc Véron
984f641417 Bug 15362: Translatability: Fix issue on Administration 'Did you mean?'
Fix sentence splitting by tags on didyoumean.tt leading to odd translations.

To test:
- Apply patch
- Go to Home > Administration > Did you mean?
- Verify that the information below the title displays properly and makes sense.
- Disable Javascript, reload page
- Verify that the warning about missing Javascript displays properly and makes sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived. Removed em tags for translation purpose

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:33:43 +00:00
Marc Véron
4983d5c4b9 Bug 15361: Translatability: Fix issue on Administration Columns settings
This patch rewords the following sentence that is not correctly translatable due to
splitting b tags:
Changes made below will only apply to item subfields that are mapped to the items table.

To test:
- Apply patch
- Verify that the rewording makes sese and that no sentences are split by tags.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording message displayed Ok for translation purpose

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:28:04 +00:00
Marc Véron
698fb010f5 Bug 15346: Translatability: fix sentence splitting issue in memberentrygen.tt
Fix sentences in memberentrygen.tt that are split by <strong> tags, leading to
wrong capitalization in German (because it can not be decided if a string is part
of a sentence or a standalone sentence).
Example: Es sind Keine Bibliotheken definiert.

To test:
- Apply patch
- To trigger the messages, you have to edit a patron in a system where
  no libraries and no patron categories are defined
- Alternatively, carefully review the changes in
  koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sentences fixed for translation purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:26:19 +00:00
Marc Véron
5e80a64ea3 Bug 15345: Translatability: fix issue in facets (Availability')
This patch fixes an issue with a splitted sentence in facets (Avalability)
that leads to weird translations e.g.:
German: 'Zeige nur Verfügbar Exemplare'
French: 'Montrer seulement disponible exemplaires'

Additionally, the link "Show all items" gets it's own li tags to display
nicely like the other links in the facets column and it removes superfluous
dots.

To test in OPAC and Staff client:
- Apply patch
- Do a search that results in more than one available items
- In column "Refine your search", click on "Limit to currently available
  items"
- Verify that the message "Showing only available items" and the link
  "Show all items" display nicely.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
use_zebra_facets set to 0 in koha-conf.xml to test. Works as described

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 20:23:49 +00:00
Nicole C. Engard
3f6a1d47fd Bug 14638: Update Serials Help
The serials help file was out of date for 3.18+

To test:

* apply patch
* Go to serials > new subscription
* Click help
* Confirm help correct

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-29 19:14:24 +00:00
Liz Rea
dba72d903d Bug 15213 - fix buttons on patron lists
To test:
go to tools -> patron lists
notice that the buttons are not misaligned anymore

You may need to force refresh the page to see the original issue, and to see it fixed.

http://bugs.koha-community.org/show_bug.cgi?id=15223

With patch buttons display nicely.
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>
2015-12-11 16:50:51 +00:00
Marc Véron
186b4b7e09 Bug 15230: Remove unused file circ/stats.pl and stats.tt from system
This patch removes stats.pl and stats.tt from system.

To test:
- Verify that both files are not used and that the only reference in
  koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
  is commented out.
- Apply patch
- Verify that the files are deleted and the reference is removed.
- git grep 'stats.pl', verify that there are no more references to
  this file.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
See the following commit for more info on this script:
  commit 60105bd692
  Date:   Tue Jul 8 20:02:34 2008 -0500
    fix for 2008: Daily reconciliation report broken

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-11 16:46:31 +00:00
353e30d73e Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
When canceling a hold from the holds over tab, you are redirected back to the holds waiting tab. Instead, we should the librarian should continue to see the list of holds past the waiting length.

Test Plan:
1) Apply this patch
2) Cancel a hold from the "Holds over" tab on circ/waitingreserves.pl
3) Note you are redirected back to the holds over tab

Signed-off-by: Tom Misilo <misilot@fit.edu>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-11 16:43:55 +00:00
Katrin Fischer
f4b8c4ede9 Bug 15202: Fix date display when transferring an order
The date a basket was created was not displayed
according to the dateformat system preference.

Also fixes wording of the message shown when there
are no baskets for a chosen vendor.

To test:
- Create an order with an order line
- Click on the "Transfer" link on the basket
  summary page
- Search for a vendor without open baskets
- Verify change of message shown:
  "There are no open baskets for this vendor."
- Choose another vendor with open baskets
- Verify the creation date of the basket is
  displayed correctly formatted.

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>
2015-12-11 16:22:54 +00:00