Commit graph

9481 commits

Author SHA1 Message Date
Jonathan Druart
61af4786ee Bug 12929: Restore behavior before bug 12716
This patch remove borrowernumber from the borrower list fields and
display the field list in the notes.

Test plan:
- verify that the list of fields is displayed on the right (Notes).
- verify the borrowernumber is not displayed anymore in the field list.

Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros@gmail.com>

Confirmed that this patch removes borrowernumber from list of default
values, and reintroduces missing list of CSV columns in the Notes field.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-14 11:25:19 -03:00
Marc Véron
285795d769 Bug 12974 - Argument "" isn't numeric in numeric gt (>) in opac-results.tt
If an item has no star ratings you get an error message in opac-error.log:
Argument "" isn't numeric in numeric gt (>) at (...) /koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt line 467.

To test:
In OPAC, search for a bilio that has no star ratings.
Check opac-error.log for message as above
Apply patch
Repeat search
Check opac-error.log again, there should be no more warnings

(Fixed mistake with brackets, see comment #2)

Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Works as advertized. Looks like you have to be logged in to trigger
the error.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as advertised, passses xt/author/valid-templates.t
2014-10-14 11:05:06 -03:00
Jonathan Druart
d7f97e3b8a Bug 12538: Two SolR-related templates remaining
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-14 10:30:29 -03:00
Jonathan Druart
cf2eb49448 Bug 12538: Remove Solr without breaking anything else
Since nobody is currently working on the zebra layer introduced by bug
8233, Solr won't never work.
Some code has been introduced in 3.10 to prove several search engines
can cohabit into Koha but no help/fund has been found to go ahead.
It is useless to keep this code and to maintain an ambiguous situation.

I think the indexes configuration page could be restore later if someone
else introduces a new search engine into Koha.

Test plan:
Look at the code introduced by bug 8233 and verify all is removed.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 16:59:04 -03:00
c4ee51abe2 Bug 7143: Adding Irma to the about page
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 16:23:32 -03:00
ac3eda3634 Bug 7143: Fixed link to Athens County Koha Opac
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 16:23:25 -03:00
Jonathan Druart
f43cad3238 Bug 7143: Change the Kohala association link
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 16:23:16 -03:00
31e443f0f8 Bug 7143 Adding a new developer to the history
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 16:23:08 -03:00
Olli-Antti Kivilahti
fe478d76e5 Bug 12938 - strings.inc is missing a semicolon in var CIRCULATION_RENEW_FAILED = _("Renew failed:")
This doesn't appear to be affecting anything negatively, but the fix
makes it more correct.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 12:22:51 -03:00
Bernardo Gonzalez Kriegel
0aab269f86 Bug 12435 - Update MARC21 frameworks to Update No. 18 (April 2014)
This patch updates MARC21 frameworks to Update No. 18 (April 2014)
Also updates values on database for MARC21 installs.

To test
1. Apply the patch
2. Run updatedatbase.pl, check that runs without error
3. Remove default framework, load again. Check that loads without
error.
4. Verify changes
Bibs
007/04 Sound recording -> q Quadraphonic, multichannel, or surround
347f -> Encoded bitrate
110/1,610/1,710/1,810/1 subfield c -> repeatable
Auth
110/1,410/1,510/1,710/1 subfield c -> repeatable

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Checked changes are according to documentation from LOC and
consistent between sample files and updatedatabase.pl.
No problems found, all English frameworks were updated.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 12:06:43 -03:00
bfdd08f74e Bug 13051: And remember, usernames are not case sensitive
opac-auth contains the following statement:
You entered an incorrect username or password. Please try again! And
remember, usernames and passwords are case sensitive.

Obviously, this is not completely true. The username can be entered in
lowercase, uppercase, any mixed case.

This patch simply adjusts this string.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 12:04:04 -03:00
Jonathan Druart
49f4382324 Bug 12740: Make the error message translatable
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 11:52:16 -03:00
Mark Tompsett
0515c06985 Bug 12740 - Data Validation followup
Added server-side validation and feedback to Koha news.

TEST PLAN
---------
1) Log in to staff client as someone who can add news
2) Paste a variation of the ugly following URL into your
   address bar:

https://demo.library-admin.kohasystem.ca/cgi-bin/koha/tools/koha-news.pl?op=add&lang=&branch=&title=&from=&to=&number=&new=

   -- A blank news item is added without warning!
3) Apply patch
4) Repeat step 2
   -- "ERROR: Required news title missing!" is displayed
      and no blank news is added
5) run koha qa test tools

Followed test plan, Error message appears as expected, qa test tool: OK
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 11:52:07 -03:00
Marc Véron
ef9a552023 Bug 12740 - It should not be possible to store empty news
This patch marks the title field as 'required' and it is not
longer possible to store a news without having at least a title.

To test:
Got to Tools->News
Create news or edit existing news
Field "Title" should have a red label and should be marked as "required"
It should not be possible to save with empty field "Title"

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

NOTE: Only keeps the user from doing it.
      Fails to handle the fake the url call case.
https://demo.library-admin.kohasystem.ca/cgi-bin/koha/tools/koha-news.pl?op=add&lang=&branch=&title=&from=&to=&number=&new=

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-11 11:51:53 -03:00
Jonathan Druart
7969b35d60 Bug 12985: All basketgroups should be listed
Only 20 first are listed, others are hidden.

Test plan:
- Create at least 21 basketgroups
- verify you can see it on the "open" tab
- close all of them
- verify you can see it on the "close" tab

There is no restriction to hide datables functions here.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-09 12:14:49 -03:00
d44a4adcc6 Bug 12755 - MARC Preview doesn't always display in managed MARC record
The MARC preview feature seems to have been broken by Bug 11570 -
Upgrade jQueryUI to the latest version. When that patch was being
developed there were no existing cases where the jQueryUI dialog feature
was used, so the patch omitted it.

Rather than update the build of jQueryUI to include the dialog feature
I'm submitting a patch which uses a Bootstrap modal instead. This keeps
the jQueryUI library smaller and avoids an unnecessary duplication of JS
functionality. It also helps keep our modals consistent.

The implementation uses progressive enhancement principles to improve
click handling: Real links in the table, so that the preview link can be
opened in a new tab if the user chooses; Event handling in the
JavaScript instead of the markup ( $(selector).on(click... instead of <a
onclick=...).

To test, apply the patch and add or view a batch of staged MARC records
(Tools -> Staged MARC management). In the list of titles (the "Citation"
column) click any link and confirm that the MARC preview loads
correctly. Confirm that previews work correctly on any page and after
re-sorting.

Confirm also that the modal window flexibly handles different browser
window sizes.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-09 12:00:33 -03:00
755655a42a Bug 12937 [Follow-up] Deleting suggestions should ask for a confirmation
This minor follow-up revises the language a bit: Adding missing question
marks and using the more standard prompt "Please select at least one..."

To test, follow the previous test plan and confirm that the prompts are
improved:

- go on the suggestion management page
- don't select any suggestion and try to delete (check the checkbox and
  submit the form). Verify that you get an alert.
- select 1 suggestion and delete it, verify you get a confirmation
  message
- select 1+ suggestions and delete it, verify you get a confirmation
  message

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-23 21:26:52 -03:00
Jonathan Druart
1b5c0966bb Bug 12937: Deleting suggestions should ask for a confirmation
On the suggestion management page, the librarian can choose to delete
suggestions but no confirmation is needed.
This could produce unexpected lost of data.

Test plan:
- go on the suggestion management page
- don't select any suggestion and try to delete (check the checkbox and submit the form).
  Verify that you get an alert.
- select 1 suggestion and delete it, verify you get a confirmation
  message
- select 1+ suggestions and delete it, verify you get a confirmation
  message

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-23 21:26:43 -03:00
Marc Véron
6246f2c700 Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch
This patch adds a branch sepecific class to all OPAC pages.

Example:
If not logged in, opac-main.pl displays:
<body ID="opac-main" class="branch-default" >
If logged in at branch FFL, it displays:
<body ID="opac-main" class="branch-FFL" >

If you log in, opac-user.pl should display
<body ID="opac-user" class="branch-FFL scrollto" >

To test:
1)
Apply patch.

2)
Add to syspref OPACUserCSS something highly visible, e.g. for branch FFL:
.branch-FFL {
background-color: yellow;
border: 10px solid red;
}

3)
Go to OPAC and login in with a user with home branch FFL

4)
Verify that colors change as appropriate.

5)
Log out. Verify that colors display as before or as defined in class branch-default in OPACUserCSS

6)
Display patch in patch diff view, verify that ids and classes in body tag are consistent with params bodyid and bodyclass in INCLUDE line

7)
Search for regressions

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-23 15:39:31 -03:00
3f2dda2f33 Bug 11672: Untranslatable dropdown on Guided Reports and dictionary
This patch removes hardcoded descriptions and sets them in the templates
using the variable content as id.

To test, create a new guided report and verify the 'module to report on' dropdown
shows as usual [1]. Functionality shouldn't get changed.

The patch also changes the dictionary pages where 'area' should be displayed/selectable
with the same strings as the guided reports. Try all the possible disctionary pages.

The last page when creating a dictionary now shows the 'area description' instead of the
code. The same happens to the dictionary list once you have dictionaries saved.

[1] The following texts get changed:
    Catalogue -> Catalog
    Acquisition -> Acquisitions

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-23 15:32:21 -03:00
Rafal Kopaczka
2d4d3d1bf5 Bug 12963: Columns misplaced in moremember.tt
After applying Bug 12899, in moremember page, checkouts table has
misplaced columns.

Test plan:
1. Check out title for a user. Columns in Detail page at checkout tab
are misplaced; there's no Due date column.
2. Aplly patch, everything shuld look fine now.

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

My bad! Thanks for catching this.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-19 16:41:50 -03:00
Katrin Fischer
3c1c5c04ce Bug 8868: Follow-up: Update boostrap documentation page
Updates the bootstrap documentation page for CancelHold.
2014-09-18 09:49:25 -03:00
3ce2c0235c Bug 12405 - Search links on callnumber fails on intranet results page
On intranet results page, the callnumber of items is a search like :
/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% result.itemcallnumber |url %]

The callnumber should be URI-escaped to avoid special URI characters like & , ? ...
If the callnumber contains some CCL words or parenthesis, the search will fail, it should be wrapped with double-quotes.

This patch adds this to catalogue/results.pl and catalogue/shelves.pl :
- uri TT filter instead of url
- adds double-quotes using there URI code %22 since its in a HTML attribute using double-quotes

Test plan :
- Edit an item callnumber with : & ABC 123
- Index zebraqueue
- Perform a search returning this item
- Click on the callnumber
=> Without this patch you get no result, because URL parameters are : idx=callnum&q=& ABC 123
=> With this patch you get results
- Set syspref QueryWeightFields off (because this is no bug if on)
- Edit an item callnumber with : AB(C) AND OR
- Index zebraqueue
- Perform a search returning this item
- Click on the callnumber
=> Without this patch you get no result, because the search contains CCL words "OR" and "AND"
=> With this patch you get results

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested all with and without queryweightfields -
all searches from clicked call numbers for given callnumbers fail without the patch, all are successful with the patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described - no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-18 09:43:16 -03:00
bf26d347c1 Bug 12763 [QA Followup] - Remove tabs and trailing space
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-18 09:41:31 -03:00
Marc Véron
2aded36d08 Bug 12763: Add more information for users to OPAC Error 404 page
This patch adds more information to the OPAC 404 error page to make it more user friendly.

To test:

- Apply patch
- Is the information clearly understandable and does it contain all necessary information?
- Native speakers: Is the text correct?
- Non native speakers: Is the text easy to translate?
- Is the HTML correct?

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-18 09:41:16 -03:00
Marc Véron
a414f413c8 Bug 4927 - OPAC advanced search has two call number entries; remove one?
This patch removes the second Call number entry in OPAC Advanced search with Advanced option (for bootstrap).

To test:
- Go to OPAC, Advanced search, enable Advaced options
- In dropdowns you see two entries "Call number"
- Apply patch
- Verify that the second "Call number" has disappeared (below ISSN)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only - no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 22:14:07 -03:00
5d5481ed19 Bug 12890 - Improve title and breadcrumbs when editing saved SQL report
When editing an existing SQL report the page title and breadcrumbs are
incomplete:

Home > Reports > Guided reports wizard >

This patch corrects this.

To test, apply the patch and edit an existing SQL report. The page title
and breadcrumbs should be more complete:

Home > Reports > Guided reports wizard > Saved reports > Edit SQL report

Patch behves as expected
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 22:03:56 -03:00
Jacek Ablewicz
9351cde90f Bug 12697 - Surplus closing </div> in OPAC advanced search (bootstrap)
In koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt template,
there is a surplus closing </div> in line 336 (= line 332, in case
Bug 12521 is applied first):

   336: </div> <!-- / .span4 -->

which causes some minor layout problems for this page - i.e.: page
footer ("Powered by Koha" + custom footer set up in system prefrences -
if any) is "glued" to the bottom (to the language selection bar);
unless Bug 12521 is applied first, this affects the placement of the
2nd search bar as well.

To reproduce:

1/ go to the OPAC advanced search page
2/ zoom out (e.g., use Ctrl-<minus> several times) and obeserve the
result
3/ no need for step 2/ (zooming out) when using a display with
(relatively) high vertical resolution; also, this particullar problem
gets more apparent/more noticeable with MARC21/USMASRC "subtype"
options being hidden in the OPAC advanced search (Bug 9043).

To test:

1/ ensure that Bug 12521 is applied first/already applied
2/ apply patch
3/ confirm that this issue is no longer reroductible

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of 12521, don't know exactly what to reproduce, but
surplus '</div>' is real (33 open, 34 close).
Everything looks correct, no koha-qa errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:58:09 -03:00
Liz Rea
77e8cf024d Bug 12521 - Change layout a bit of the opac advanced search
To test:

Load up the advanced search and make sure it displays properly, with all of the elements within the main div, and only one container-fluid.

Patch behaves as expected. Advanced search looks much better now.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked visually and with HTML validator.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:56:31 -03:00
Marc Véron
3996fa7b47 Bug 12882 - Translations: Resolve ambiguity for word "checked" in Z39.50 server administration
This patch resolves the ambiguity of the word "Checked" for Z39.50
server administration.

To test:
Apply patch
In staff client, go to Home:Administration:Z39.50/SRU servers
Result: Column heading of 6th column should show "Preselected" (instead
of "Checked")

Edit or create new server for Z39.50 and SRU
Result: Checkbox underneath "Password" should have label "Preselected
(searched by default):"

Click "Help" at top right of screen
Result: Wording changed for selecting targets as default.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:52:30 -03:00
781142224c Bug 12863 [CSS follow-up] News in OPAC: HTML broken with nested p tags and multiple thead in same table
This patch contains the revised and compiled CSS which will style the
OPAC's new news markup to match the previous version.

To test, apply the patch and clear your browser cache if necessary. View
news in the OPAC and confirm that it is styled like it was before the
patch making markup changes.

CSS patch behaves as expected. Thanks to Owen for adding this.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:50:32 -03:00
f10f88266b Bug 12863 [LESS follow-up] News in OPAC: HTML broken with nested p tags and multiple thead in same table
This follow-up modifies the LESS file to add style to the new markup to
match the previous markup. A subsequent patch will include the revised
and compiled CSS.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:50:27 -03:00
Marc Véron
dbe1e920d3 Bug 12863 - News in OPAC: HTML broken with nested p tags and multiple thead in same table
This patch fixes broken HTML in OPAC news by replacing table display
with divs.

To test:

Create multiple news for OPAC
Validate with HTML validator or check source code
Result:
Error with nested p tags
Table header thead is repeated for every news (not allowed)
Bonus testing: Let a screen reader like NVDA read the news and try to
understand it with closed eyes.

Apply patch
Result:
No more HTML errors in news
Screen reader reads news properly

To style you can use classes newscontainer, newsitem, newsheader,
newsbody and newsfooter.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 21:50:25 -03:00
cd69768f72 Bug 10883 - AllowHoldDateInFuture can let a patron jump to the top of the holds list
If a patron is allowed to add a future date for the hold using the
"Hold starts on date" field, that patron can put a date in that is
in the *past* which will cause them to move to the top of the holds
queue ( assuming they make the past date far enough back that it is
earlier than all the other hold dates ).

Test Plan:
1) Enable future holds
2) Note you can use dates in the past for "hold starts on date"
3) Note you can use dates in the past for "hold expires on date"
4) Apply this patch
5) Refresh the page
6) Note you can no longer use dates in the past for those fields

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changed subject: OpacAllowHoldDateInFuture to AllowHoldDateInFuture
as this fix applies to staff.
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 20:12:49 -03:00
788d6bd724 Bug 11577 : Fixing a tiny typo
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:31 -03:00
Holger Meißner
6d022bd4a4 Bug 11577: Add Hochschule für Gesundheit to contributing institutions
Automatic renewal is the second feature sponsored by the hsg.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:28 -03:00
Holger Meißner
17821c58cc Bug 11577: OPAC bootstrap theme changes
This patch makes opac-user.pl and the bootstrap version of opac-user.tt
handle the new renewal errors "auto_renew" and "auto_too_soon".

To test:

1) Set global syspref "opacthemes" to bootstrap.
2) Set global syspref "OpacRenewalAllowed" to Allow.
3) Test the same things as in previous patch, this time for the OPAC
   summary page.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:21 -03:00
Holger Meißner
0270b8d3b6 Bug 11577: Expand description of AllowRenewalLimitOverride
With the introduction of the new automatic renewal feature global syspref
AllowRenewalLimitOverride is expanded in meaning. It now gives the option
to override blocks if:

- the number of allowed renewals is exceeded
- the renewal is premature (No renewal before)
- the item is scheduled for automatic renewal
- the renewal is premature and the item is scheduled for automatic renewal

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:18 -03:00
Holger Meißner
555d0d5898 Bug 11577: Add 'auto_renew' and 'auto_too_soon' to renewal page
This patch adds the new renewal errors 'auto_renew' and 'auto_too_soon'
to the renewal interface.

To test:

1) Issue two items:
   - one with automatic renewal and no value for "No renewal before"
   - another with automatic renewal and a value for "No renewal before"
2) Try to renew:
   Home > Circulation > Renew
3) Confirm there are error messages explaining that the items have been
   scheduled for automatic renewal and that one of the renewals is also
   premature.
4) If global syspref AllowRenewalLimitOverride is set to "Allow" you
   should be given the option to override.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:16 -03:00
Holger Meißner
b49bcfef09 Bug 11577: Code and intranet template changes
This patch adds a checkbox for "Automatic renewal" to the checkout page.
CanBookBeRenewed is modified to include two new errors:
- auto_renew (renewal shouldn't be done manually)
- auto_too_soon (renewal is premature and shouldn't be done manually)

To test:

1) Add or edit an issuing rule with "Automatic renewal" and another
   one without it.
2) Issue at least three items:
   - automatic renewal by issuing rule
   - automatic renewal by Checkbox on the checkout page
   - no automatic renewal
3) Test the following steps for both:
   Home > Circulation > Checkouts
   Home > Patrons > Patron details
4) Confirm that issues with automatic renewal cannot be renewed manually,
   even if there are still renewals left and it's not too soon to renew.
5) Confirm that "Scheduled for automatic renewal" and the remaining
   renewals are displayed. If no renewals are left "Not renewable" should
   be displayed.
6) Confirm that issues without automatic renewal behave as usual.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:14 -03:00
Holger Meißner
633f6c150e Bug 11577: Add "Automatic renewal" to the circulation and fine rules
This patch adds a column "Automatic renewal" to the circulation and
fine rules table.

To test:

1) Add or edit some issuing rules.
2) Confirm that "Automatic Renewal" is set to "No" by default and
   can be switched to "Yes".

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-17 19:23:09 -03:00
d8ed913059 Bug 12899: Row grouping in checkouts table is alphabetical and depends on translation
The sort order of the "today's checkouts" and "previous checkouts" row
groupings depends on the label, so in English "today's checkouts" comes
first. However, in other languages the reverse alphabetical order is
incorrect resulting in "previous checkouts" coming first.

This patch adds a dummy column with numeric data on which the sorting
can be done. This should make it translation-agnostic.

To test, apply the patch and install or update a translation which will
demostrate the problem (sv-SE for instance).

- Clear your browser cache and switch to the English templates.
- Check out some items to a patron who has checkouts from a previous
  day.
- Confirm that the sorting of the "today's checkouts" and "previous
  checkouts" row groups is correct.
- Switch to the new/updated translation and reload the circulation page
  for that patron. Confirm that the sort remains correct.
- Confirm that the checkouts table looks correct and that other features
  (sorting, checkboxes) still work correctly.

Revision: Corrected the table footer include to correct the colspan
error causing column misalignment.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-16 15:20:51 -03:00
Jacek Ablewicz
7289214e30 Bug 12811 - Patron 'Details' and 'Check out' pages not working for staff users without renewal override permissions
In case when the staff user doesn't have (circulate) ->
(override_renewals) permission granted, this code part

   var AllowRenewalLimitOverride = [%
CAN_user_circulate_override_renewals && AllowRenewalLimitOverride %];

in circ/circulation.tt and members/moremember.tt leads to javascript
error, because TT statement evaluates to empty string.

To reproduce:

- set AllowRenewalLimitOverride syspref to "Don't allow" (this step is
  possibly redundant / not quite relevant),
- for testing purposes, log in as some (sample) staff user whitch does
  not have permission granted for "(override_renewals) Override blocked
  renewals",
- have a look at some patron accounts (preferably, ones with 1+
  check-out), observe that page layout is incorrect in "Check Out" and
  "Details" tab.

To test:

- apply patch,
- retest and ensure that this issue is no longer reproductible,
- make sure that there are no regressions of any kinds regarding renewal
  override permission for staff users (i.e, that it still works like
  intended).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes QA script and tests.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-16 15:18:54 -03:00
Dobrica Pavlinusic
b8fae8489f Bug 12729 - Overdue items won't show as overdue in red in circulation
It seems that Firefox date parser doesn't like our dates which are
formatted in ISO format like "2014-08-06 00:00:00". This results in
missing red color in overdue dates.

So intead of munching different date formats and JavaScript (and having
to support different browers) this patch moves check for overdue dates
back to mysql and just transfers boolean value to JavaScript so it can
show correct class for date_due.

Test scenario:
1. find borrower with overdue checkouts
2. verify that all dates are black (and are in ISO format)
3. apply this patch
4. reload page and verify that overdue dates turned red

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with different due dates (hourly and not) and different date formats.
Passes tests and QA script.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-16 15:17:53 -03:00
e261343aac Bug 12574 - BiblioDefaultView doesn't affect XSLT results view
The OPAC's XSLT results view does not respect the choice set in the
BiblioDefaultView system preference. This patch adds a check of the
preference to the OPAC's results view for MARC21.

To test you must have the OPAC configured to use the XSLT view for
search results. Perform any search and test the link to a title's detail
page. Switching the values of the BiblioDefaultView should be correctly
reflected in the search results links.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described for XSLT view in OPAC.

Notes:
- maybe we should change the pref text from 'simple form' to 'normal view'.
- the patch doesn't include changes to the title link generated from an 880
  field - so those links will still lead to the wrong view.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-14 02:02:50 -03:00
d968df4743 Bug 10571 - IntranetBiblioDefaultView doesn't do anything with MARC21 XSLT
The staff client's XSLT results view does not respect the choice set in
the IntranetBiblioDefaultView system preference. This patch adds a check
of the preference to the staff client's results view for MARC21.

To test you must have the staff client configured to use the XSLT view
for search results. Perform any search and test the link to a title's
detail page. Switching the value of the IntranetBiblioDefaultView
preference should be correctly reflected in the search results links.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no koha-qa errors.

Only for MARC21 :(

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-14 02:02:50 -03:00
8af38d518f Bug 12587: (qa followup) report name consistency
Reports home should show the same report name (i.e. "Patrons with the most checkouts")
the report itself uses. It is chosen as it is more idiomatic.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-09 10:48:59 -03:00
bfb20c9a7e Bug 12587 - Improve output of filter information on patrons with the most checkouts report
This patch makes some changes to the way filter information is displayed
after running the patrons with the most checkouts report. Before this
patch several untranslatable English strings would be displayed, and
library and item type codes would be shown instead of descriptions.

To test, go to Reports -> Patrons checking out the most. Enter values
for all the filter options:

- Checkout date from
- Checkout date to
- Checkin date from
- Checkin date to
- Library
- Item type
- Patron category

When you submit the form and view the results you should see your date
submissions formatted according to your selected dateformat system
preference. The library name and item type names should be shown instead
of codes.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves translatability of the filters output after running
the report and the readability of them (removing codes).

Note: it would be nice if the read-only would be removed from the date
fields, as forcing people to use the date widget is a known accessibility
issue.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-09 10:39:18 -03:00
Jonathan Druart
d036b9a4d1 Bug 12557: DB changes - Add the AcqItemSetSubfieldsWhenReceiptIsCancelled pref
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-09 10:09:58 -03:00
Marc Véron
d908dad443 Bug 12698 - If user changes home library in Opac change is not visible in staff client
To test:
- Set opacuserlogin and OPACPatronDetails to allow
- Log in to OPAC, go to 'your personal details'
- Change Home library
- Go to staff client: Patrons requesting modifications (/cgi-bin/koha/members/members-update.pl)
- Without patch, you do not see the change request, but can Approve, Deny or Ignore it
- With patch, you see the change request, indicating the Home library (branchcode)

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I "slightly" rewrote the patch so it applies on current master.
2014-09-08 13:03:30 -03:00