Commit graph

9623 commits

Author SHA1 Message Date
65e6deb5fa Bug 13128 - Add span with id for logged in branch name, add hidden span for branchcode
It would be nice if there were a simple way to access the name and
branchcode of the currently logged in library, as well as the logged in
user via JavaScript ( via intranetuserjs ).

I propose the following:
1) Remove the whitespace surrounding the loggedinusername span
2) Wrap the logged in branch name with a span that has an id
3) Add the branchcode in a hidden span that has an id

Test Plan:
1) Apply this patch
2) Log into Koha
3) Inspect the html source code
4) Note the lack of whitespace within the tag <span class="loggedinusername">[% loggedinusername %]</span>
5) Note the logged in branch name is now surrounded by a span with an id
6) Note below that is a span containing the branchcode, also with an id.
7) Verify the branchcode span is hidden by default.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 12:17:49 -03:00
d7f824e501 Bug 13140: Add a notice on the About page about GRS-1 deprecated
This patch changes the text for zebra_auth_index_mode and zebra_bib_index_mode
entries missing on koha-conf.xml telling the user GRS-1 is deprecated.

It also adds another check for those preferences set to GRS-1, and shows a
warning message if set to grs1.

To test:
- Apply the patch and try all combinations:
- zebra_auth_index_mode and zebra_bib_index_mode missing
- zebra_auth_index_mode and zebra_bib_index_mode set to grs1
- Sign off :-D

Regards

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

I've played with the 3 related koha-conf.xml file parameters:
zebra_auth_index_moda, zebra_bib_index_mode missing, and use_zebra_facets.
Inconsitencies are properly reported in About page thanks to this patch. It
would be helpfull to admin upgrading their Koha installation.

And by the way, thanks Tomas for the new Zebra facets functionnality. It's a
'joy' to see it into Koha.

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-10-27 11:24:09 -03:00
42efe724f7 Bug 12900: (consistency followup) add buildBiblioDefaultViewURL to MARC21 XSLT
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, tested in UNIMARC and MARC21.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 10:52:48 -03:00
84be3e7709 Bug 12900: IntranetBiblioDefaultView doesn't do anything with NORMARC or UNIMARC XSLT
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 10:52:37 -03:00
61ad4b2357 Bug 13138: Remove jQuery plugins which were used by Solr
This patch removes two jQuery plugins which were used only by
Solr-related templates. With the removal of Solr these plugins are
obsolete.

To test, search the Koha code for references to the two plugins:

jquery.textarea-expander.js
tablednd.js

There should be none.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Couldn't find any references. Also passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 10:52:21 -03:00
Chris Cormack
8c8fb35864 Bug 9350: Making changes so that you can add the new fields to branches
To test

1/ Apply patch
2/ Add or Edit a branch, filling out the new fields
3/ Check that the changes saved

http://bugs.koha-community.org/show_bug.cgi?id=9530
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 10:38:16 -03:00
Chris Cormack
cf8dcf8e0c Bug 9530: Adding sysprefs and making changes to the branch table
To allow for separate Reply To and From email addresses for notices

This patch will make no functional changes, it just sets up the db
changes needed.

To Test:
Apply patch, upgrade DB, make sure everything still works fine

(Or wait to test with following patches)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-27 10:38:12 -03:00
91eb4252c7 Bug 13042 - Move budget action links into menu
The series of links in the "actions" column of the budgets
administration summary table are not very readable as they are, all
strung together: Edit Delete Duplicate Close Add fund.

This patch moves the links into an "Actions" menu, similar to the change
made by Bug 10615 in Reports.

To test you should have multiple active and inactive budgets. Apply the
patch and go to Administration -> Budgets. Confirm that each menu item
links to the correct action. Test the menu for both active and inactive
budgets.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice improvement on template level, works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-24 10:02:01 -03:00
f9965d53c2 Bug 2969 - Report Name should be mandatory for saved reports
This patch re-implements the database changes from the original patch
and adds an update for existing reports. It also reimplements the
client-side validation using the new built-in validation plugin and adds
coverage for SQL reports.

I have also added the "required" attribute to the SQL report textarea
since saving a report with no SQL triggers an error.

To test:

- Create a new guided report. Confirm that you cannot save your guided
  report without a report name.
- Create or edit a saved SQL report. Confirm that you cannot save your
  report without a name or without SQL.
- Confirm that the saved_sql table structure has been updated.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Functional tests pass, database tables look correct to me.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Even with JS disabled, the form can not be submitted without the
report name filled in.
However we are not checking this server side .. if this was the public
interface that would be a fail. I will leave this up to the RM to
decided if client side checks are ok for this. Bearing in mind we
weren't handling any sql errors properly server side before this.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: description of the updatedb entry

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-24 09:47:37 -03:00
Jonathan Druart
f41a30fe38 Bug 13071: format_date should not be called in currency.pl
The TT plugin is used in the template, it is useless and can cause
problems to format the dates before sending them to the template.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem I was seeing before, didn't find any regressions.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Checked all three settings of dateformat. Looks fine to me.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-24 09:46:05 -03:00
67a2d18fbc Bug 13087: Add a notice for use_zebra_facets problems in about page
This patch adds two checks to about.pl:

- use_zebra_facets entry presence in koha-conf.xml
- use_zebra_facets==1 and zebra_bib_index_mode==dom

The idea is to alert the user if it has conflicting or wrong settings. Even
if there's a fallback to a working configuration.

To test:
- On clean master install, go to the about page
=> SUCCESS: No warnings regarding use_zebra_facets
- Comment out the use_zebra_facets entry, reload
=> SUCCESS: The about page mentions the use_zebra_facets entry is missing
- Uncomment the use_zebra_facets entry, make sure it is set to 1
- Change zebra_bib_index_mode to 'grs1', reload
=> SUCCESS: The about page says zebra_bib_index_mode is not set to DOM even though
  you have use_zebra_facets set.
- Sign off :-D

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Followed test plan with success

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, tested by changing the koha-conf.xml file.
Note: There is no warning if use_zebra_facets is 0.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-24 09:42:48 -03:00
cb33584de7 Bug 11926 [Follow-up] HEA - Render community koha statistic usages
This follow-up makes some language and spelling corrections to the
system preference descriptions. I have updated the preferences heading
to read "Share anonymous usage statistics" in order to emphasize the
anonymous aspect.

I have also updated the main preference name from "UsageStatsShare" to
"UsageStats" so that it is alphabetized first in the list of
"UsageStats*" preferences. I think this will make it clearer to the Koha
administrator what feature they are configuring.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:17:23 -03:00
Katrin Fischer
af2a4c59eb Bug 11926: Follow-up - remove SearchEngine pref / fix POD
Patch set reintroduced the formerly removed system preference,
just removing it again.

Also fixes complaints of the QA script about POD in the new module.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:17:14 -03:00
Jonathan Druart
7d5105968e Bug 11926: Add new sysprefs and fix encoding issues
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:17:09 -03:00
Jonathan Druart
3da1960d21 Bug 11926: Add a cronjob
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:17:07 -03:00
Alex Arnaud
07db379676 Bug 11926: Render community koha statistic usages
Goals:
- Collecting Koha usage statistics
- Rendering stats on a community website
- Having a big bicture of how koha is used

3 parts in the project:
- this patch in koha
- hea-ws which collects data
- hea-app which renders data

Installation:
1/ Fill systempreferences:
UsageStatsLastUpdateTime UsageStatsID UsageStatsShare UsageStatsLibraryName
2/ Setup a cron in your crontab (ex: at 3:00 every first of the month):
0 3 1 * * export KOHA_CONF=/home/koha/etc/koha-conf.xml; export PERL5LIB=/home/koha/src; perl /home/koha/src/C4/UsageStats.pm

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:17:00 -03:00
f6daff353d Bug 9368 [ALTERNATE] - specific behavior of yr and acqdate indexes
This patch fixes the "Publication date" and "Acquisition date"
searches when using non-QueryParser and QueryParser searches.

It adds structure attributes to the template, which is consistent
with how phrase searching is currently handled.

It removes unnecessary code from Search.pm, adds some necessary
code which is consistent with existing code, and adds a lot of
explanatory comments.

_TEST PLAN_

Before applying:
0) Turn off QueryParser
1) Try a "Publication date" or "Acquisition date" search from the
staff client advanced search.
2) Note that even though the description on the result page makes
it seem like you're doing an index-specific search, you're actually
doing a keyword search. You can verify this by checking the 008
from positions 7 to 10 for "Publication date" or "Date accessioned"
on items for "Acquisition date".

3) Turn on QueryParser
4) Try doing the searches from Step 1.
5) A "Publication date" search should probably produce zero results

After applying patch:
6) Keep QueryParser on
7) Try doing the searches from Step 1.
8) Notice that you're actually getting results consistent with
your search (ie the 008/7-10 shows the date you searched for,
and there is a "Date accessioned" in items which matches your
search)

9) Turn off QueryParser
10) Note that your results are exactly the same as step 8
(N.B. this is because QueryParser is falling back to non-QP mode
instead of producing a bad query.)

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 15:16:55 -03:00
99bfa09cc6 Bug 13104 - Changing date or time format on a production server will create duplicate fines!
The system preference TimeFormat decides if times are formatted in 24
hour or 12 hour format. The issue at hand is that this changes the time
description for fines. Let us assume the time format is currently 24
hour, and there are overdue items with accruing fines. When the format
is changed to 12 hour, and fines.pl is run, it will begin looking for
fines with a 12 hour format. Since there are no, it will create a new
fine and you will now have two fines for the same item!

There are solutions which require database manipulation:
1) Update all existing fines from 24 hour to 12 hour format
2) Delete all existing accruing fines so they are all regenerated the
following night

The same situation applies to DateFormat.

The accounts rewrite ( Bug 6427 ) will resolve this issue, as it does
not look for existing fines based on the description.

I believe the best course of action until bug 6427 is pushed to master
is to add a warning to the system preference to not alter it on a
production server with existing fines.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds some documentation to warn about the problem.
Tested the new addition shows up in po files.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 14:30:52 -03:00
b8b200836e Bug 11812 - Add missing "required" indicator to fields which are required
Form fields in the staff client which are required should be configured
to be so by doing several things:

- Add a class "required" to the field's <label>
- Add a class "required" to the form field
- Add 'required="required"' to the form field
- Apppend a <span class="required">Required</span> after the form field.

Several places in the templates are missing the <span>. This patch adds
them.

To test, apply the patch and view the following pages to confirm that
the "Required" text appears:

- Acquisitions -> Add an order to a basket from a new (empty) record.
  Title, quantity, and fund should indicate they are required.

- Administration -> Authority types ->  New authority type. The
  authority type and description fields should indicate they are
  required.

- Administration -> Authority types -> MARC structure -> New tag. The
  tag field should indicate it is required.

- Patron types and categories -> New category. Category code,
  description, and category type should indicate that they are required.
  FIXME: Enrollment period is required but the user must choose one. I'm
  not sure how to handle that clearly.

- Tools -> CSV profiles. Profile name, profile type, and profile MARC
  fields should indicate they are required on both the new and edit
  forms.

- Administration -> Manage MARC modification templates. Under "Create a
  new template" the name field should indicate that it is required.

- Tools -> Batch patron modification -> Submit a batch for editing. Any
  fields which are required according to your BorrowerMandatoryField
  system preference should indicate that they are required.

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

QA Edits: Re-worded the "required" not on the batch patron edit form,
added a missing word to the help text on that page. On the csv-profiles
page I removed an unnecessary "javascript:" protocol from the markup.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works and passes QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-22 14:04:43 -03:00
01c509f37d Bug 10960 - Holds Queue Report display loc code not description
The holds queue report shows codes for item shelving location and for
library transfer location. This patch adds template plugin handling of
both these fields to display their full description.

To test, make sure you have one or more items in your holds queue which
have a shelving location. Rebuild your holds queue if necessary and view
it. Items which have a shelving location should show the description
instead of the code. The "send to" column should show the library name
instead of code.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, making use of the TT plugins.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-21 16:16:58 -03:00
Marc Véron
b47e0360d8 Bug 12914 - Wrong message 'Patron(..) is blocked for 2014-09-30 day(s).
The message in circulation.tt assumed to get days but date is given. Updated comments and message depending on expiration date or no expiration of restriction.

The message shows up on top of Bug 643 Allow override of 'debarred' status if a patron has a restriction.

Replaced date_format with date template (see comment #6)

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-21 16:13:28 -03:00
8848e72d78 Bug 13020 - Checkouts table default ordering is incorrect
The checkouts table is no longer keeping "today's checkouts" in the
order they were scanned.

Test Plan:
1) Create 3 records "Test 1", "Test 2" and "Test 3" each with one item
2) Check out the items to a patron in the order "Test 2", "Test 1", "Test 3".
3) Note the order is incorrect.
4) Apply this patch
5) Refresh the page
6) Note the order is now correct

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Note that the bug already exists before bug 12550. I checked on a 3.14.x
branch (without the ajax circ stuff), and the order is the same as with
this patch.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-19 11:30:58 -03:00
b4b9e0d212 Bug 12550 [QA Followup] - Make checking the checkbox load the table of checkouts
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-19 11:26:35 -03:00
e44b4cbeed Bug 12550 - Add ability to delay loading of patron's checkouts in circulation and patron details
Now that a patron's checkouts are loaded asynchronously, we can further
improve Koha's performance by not loading the checkouts table when it is
not needed. For example, if a librarian is checking out 5 items to a
patron, we really don't need to load the table during the scanning of
items 1 to 4, just for item 5. Another example would be browsing to the
patron details table in order to change a patron's password.

Test Plan:
1) Apply this patch
2) Browse to circulation.pl for a patron
3) Note the table is not loaded automatically
4) Click the "Show checkouts" button
5) Note the checkouts table loads
6) Check the "Always show checkouts immediately" checkbox
7) Reload the page, the checkouts should now load immediately
8) Repeat steps 3-7 for the patron details page ( moremember.pl )

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: remove trailing spaces.
Note: I am not sure the checkbox is at the best place, but I don't have
a better suggestion.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-19 11:26:06 -03:00
Mark Tompsett
cf1a63cb0c Bug 12862: OPAC bootstrap - clean up language="javascript"
There was a <script language="javascript"> tag.
It was cleaned up to be <script type="text/javascript">.
Also, the div was being chopped because the script was
in the middle of the div. Moving it to head solved the issues.

This is difficult to test, since the printslip is triggered
when you click Finish.

TEST PLAN
---------
 1) Home -> Koha administration -> Global system parameters -> OPAC
 2) Set the OPAC system preference 'opacthemes' to 'bootstrap'.
 3) Start the self-checkout client (/cgi-bin/koha/sco/sco-main.pl)
 4) Log in.
 5) Check something out.
 6) Change the address url text box to
    .../cgi-bin/koha/sco/printslip.pl?borrowernumber=##&amp;print=qslip
    Where ## is your borrower number which just checked something out.
 7) Click Cancel on the print dialogue
 8) View Page Source
    -- The HTML validation plugin will point out multiple errors.
 9) Apply patch
10) Refresh page
11) View Page Source
    -- Much happier validation results.

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-10-18 11:13:07 -03:00
Mark Tompsett
2ad6998476 Bug 12862: Staff client tweaks related to obsolete language="javascript"
As a result, this patch removed the deprecated tag from the
intranet templates.

And since there was just 1 other tiny error in the same template
file, the checked="checked" was removed from a text box.

TEST PLAN
---------
1) Install the HTML Validator 0.9.5.8 for FireFox.
2) Open Intranet to Home -> Tools -> News
3) View Page Source
   -- you'll notice the message about language="javascript" being
      one of the error messages.
4) Click Edit beside one of the news items.
5) View Page Source
   -- you'll notice the message about language="javascript" being
      one of the error messages.
6) Apply patch
7) Repeat steps 2 to 5 without "language="javascript" related
   error messages.
8) Run koha QA test tools.

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-10-18 11:13:01 -03:00
Robin Sheat
ecb1e046a6 Bug 12296: make search box customisable with OpacCustomSearch
This allows the search box to be replaced by some custom HTML, useful
when you're needing to integrate with some other search system, and
don't want to maintain a template change across upgrades.

Test plan:
* Install patch
* Look at the OPAC, see that nothing has changed.
* Change the OpacCustomSearch syspref to something like <h1>Zuul</h1>
* Look at the OPAC again, you can no longer search, there is only Zuul.

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

Works as advertised. Seems like it would be really easy to screw up your
OPAC with this feature, but since we already offer other easy ways to
screw up your OPAC I guess this fits in.

New patch changes: removed the bootstrap code, changed the entry in
syspref.sql

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes QA script and tests.
The feature has some limitations, described on the bug.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-18 10:44:45 -03:00
daabe8eaa9 Bug 12725: Show RDA tag 264 on Intranet Results and Detail XSLT view (MARC21)
As bugs 12724 and 12726 did on OPAC, this patch adds similar changes to
Intranet Results and Details XSLT view. It shows information from tag 264 on
the Publisher line of Intranet Results and Detail.

Test plan (see also bug 12742 and the rules mentioned there):
[1] Add tag 260 and some 264s to your MARC21 record.
[2] Check the display of Intranet Results.
[3] Check the display of Intranet Detail.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Results and detail show 264. I added 2 but only shows the second,
is that right?

[Reply from marcel:] Yes. Based on the rules described, it picks the most
'appropriate' 264.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-18 10:28:39 -03:00
c4e218fe20 Bug 12726: Show RDA tag 264 on OPAC Results XSLT view (MARC21)
This patch adds the same information to the Publisher line of OPAC Results
as bug 12724 did on OPAC Detail.
To accomplish this and reduce repeated code, two XSLT routines (named
templates) are moved from OPACDetail to MARC21slimUtils.

Test plan (see also bug 12742 and the rules mentioned there):
[1] Add tag 260 and some 264s to your MARC21 record.
[2] Check the display of OPAC Details. Should not have changed.
[3] Now check also the display of this record in OPAC Results.
[4] Change some indicators in the record. Check OPAC Results again.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of 12724, no change on detail, more data on results.
No koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Change moves display logic to Utils, 260 will display as
before and 264 will only display if there is no 260.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-18 10:27:28 -03:00
3151fbe689 Bug 12724: Show RDA tag 264 on OPAC Detail XSLT view
This patch adds selected information from tag 264 to the Publisher line
on the OPAC detail XSLT view (MARC21). This includes a label, and the
subfields abc.

If Publication tag 260 exists, it adds information. If tag 260 does not exist,
it creates a 'publisher' line. (NOTE: Probably, both fields will not both be
present, but this patch can deal with that..)

Instead of showing all 264 tags, it picks the preferred one based on the
following rules (using both indicators; see LOC description):
[1] Try to select a Publisher -- Latest. Pick first one.
[2] Else try to select a Publisher. Pick the last one.
[3] Else try to select an other one (Producer, Manufacturer, ..) with Latest.
    Pick the first one of that.
[4] Otherwise: Pick the last 264 tag.

Test plan:
[1] Add one 260 and multiple 264 tags to your record.
[2] Check display in OPAC detail XSLT.
[3] Change some indicators, subfields of the 264s.
[4] Check display again, following the above rules.
    Go back to step 3 a couple of times.
[5] Remove tag 260. Check display again.

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-18 10:26:32 -03:00
Jonathan Druart
e3099d7c59 Bug 12646: Display all invoices on the same page
Only first 20 invoices were displayed on the page. Without pagination, DT
did not allow to show others.
This page explicitely removes the pagination option in order to display
all invoices on the page.

Test plan:
1/ Create 21+ invoices
2/ Go on acqui/invoices
3/ Verify all invoices are displayed.

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-16 12:52:15 -03:00
Bernardo Gonzalez Kriegel
9b9b057c77 Bug 12927: Problems with item information tab on acq order from staged page
This patch fixes a regression introduced (by me)
on Bug 12673.

I adds the code needed to display properly all fields

To test:
1) Check that 'AcqCreateItem' syspref is set to 'placing an order'
2) Satage a file with some items
3) Go to a Vendor, create a basket, clic add from staged file, select your file
4) On 'Item information' tab fields are displayed wrong

5) Apply the patch

6) Reload, display must now be fixed

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:51:13 -03:00
0df1c58f87 Bug 8446: (qa followup) Patch reintroduces SolR stuff
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:34:19 -03:00
89ee1aeab7 BUG8446, QA Followup: Cleanup tabs and license
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:27:57 -03:00
3c9004357d BUG8446, Follow up: Improve local login fallback
- Local fallback was not very well implemented, this patch adds
  better handling for such cases allowing clearer failure messages
- This patch also adds the ability to use single sign on via the
  top bar menu in the bootstrap theme.

BUG8446, Follow up: Adds perldoc documentation

- Add some documentation to the Auth_with_Shibboleth module
  including some guidance as to configuration.

BUG8446, Follow up: Correct filenames to match guidlines

- Moved Auth_with_Shibboleth.pm to Auth_with_shibboleth.pm to match
  other files present on the system.

BUG8446, Follow up: Correct paths after file rename

BUG8446, Follow up: Implemented single sign out

- This follow up rebases the code against 3.16+ which managed to break
  some of the original logic.
- As a side effect of the rebasing, we've also implemented the single
  sign out element. Upon logout, koha will request that the shibboleth
  session is destroyed, and then clear the local koha session upon
  return to koha.  Due to the nature of shibboleth however, you will
  only truly be signed out of the IdP if they properly support Single
  Sign Out (which many do not). As a consequence, although you may
  appear to be logged out in koha, you might find that upon clicking
  'login' the IdP does NOT request your login details again, but instead
  logs you silently back into your koha session. This is NOT a koha bug,
  but a shibboleth implementation issue that is well known.

BUG8446, Follow up: Fixed bootstrap login via modal

- The bootstrap theme enable login from any opac page via modal. To
  enable this with shibboleth we had to make some template parameters
  globally accessible when shibboleth is enabled.

BUG8446, Follow up: Add template rules for Shibboleth and CAS

- Add template rules so that CAS and Shibboleth can coexist.

BUG8446, Follow up: Added default config to config file

BUG8446, Follow up: Embellished perldoc documentation

- Updated perldoc to correct detail about configuring shibboleth
  authentication.
- Updated perldoc to include subroutines and their respective functions.

BUG8446, Follow up: Enable configuration of match field

- Added clearer, more flexible, configuration of shibboleth attribute to
  koha borrower field matching for authentication
- Correcting of documentation to make it more clear to the current
  implementation
- Minor refactoring of code to reduce some code duplication

Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:27:51 -03:00
Jesse Weaver
244cfaba71 BUG8446, Follow up: Remove unnecessary sysprefs, move to config
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:27:49 -03:00
Matthias Meusburger
400b538078 BUG8446: Adds Shibboleth authentication
- Use the shibbolethAuthentication syspref to enable Shibboleth authentication
 - Configure the shibbolethLoginAttribute to specify which shibboleth user
   attribute matches the koha login
 - Make sure the OPACBaseURL is correctly set

BUG8446, Follow-up: Adds Shibboleth authentication

 - Fix logout bug: shibboleth logout now occurs only when
   the session is a shibboleth one.
 - Do some refactoring: getting shibboleth username is now
   done in C4::Auth_with_Shibboleth.pm (get_login_shib function)

BUG8446, Follow-up: Adds Shibboleth authentication

 - Adds redirect to opac after logout

BUG8446, Follow-up: Adds Shibboleth authentication

 - Shibboleth is not compatible with basic http authentication
   in C4/Auth.pm. This patch fixes that.

BUG8446, Follow-up: Adds Shibboleth authentication

 - Use ENV{'SERVER_NAME'} instead of syspref OpacBaseURL in order to work with
   multiple vhosts.

BUG8446, Follow-up: Adds Shibboleth authentication

 - Adds missing protocol for $ENV{'SERVER_NAME'}

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jesse Weaver <pianohacker@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with the feide idp.
- LDAP login and logout are working
- local login/logout are still working
- CAS login/logout are still working

Instructions for setup can be found on the wiki:
http://wiki.koha-community.org/wiki/Shibboleth_Configuration

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-16 12:27:42 -03:00
cb4b7f7c81 Bug 7143 - Fix name and link to Athens County Public Libraries
The previous update to the Athens County Public Libraries link was
incorrect. It is preferable to point to our library system's home page
rather than our OPAC. If any change is necessary it is to update the
name from the old "Nelsonville Public Library" to the new "Athens County
Public Libraries."

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-15 18:11:09 -03:00
e0c7a42a85 Bug 13062 - Cataloging search no longer passes search terms to z39.50 search
If you search the catalog and click new from z39.50, your term is put in
the search popup. Doing the same thing from the cataloging search no
longer works.

Test Plan:
1) Do a cataloging search
2) Click "New from Z39.50/SRU"
3) Note you get a blank search form
4) Apply this patch
5) Repeat steps 1-2
6) Note the search time is now pre-populated

Signed-off-by: Veronica Lencinas <verolencinas@yahoo.com.ar>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-15 18:08:40 -03:00
a46b3b4de0 Bug 2889 - templates should use [% IF ( loop.odd ) %] - Administration
Some scripts pass a template variable to facilitate an alternate table
row class for styling. Other use the 'IF (loop.odd)' construction. I
think we're at the point where the CSS3 :nth-child() selector is
widely-supported enough that we can do without template-based solutions:

http://caniuse.com/#feat=css-sel3

This patch adds such a selector to the staff client CSS and removes the
corresponding template markup from Administration pages. The last in
this series of patches will remove the redundant CSS.

Also in this patch: a few minor markup corrections.

To test, apply the patch and clear your browser cache if necessary. View
the following pages and confirm that alternate table row highlighting
works as before:

 - Administration -> Budgets
 - Acquisitions   -> Vendor -> Contracts
 - Administration -> Budgets -> Budget -> Planning
 - Administration -> Authority types
 - Administration -> Authority types -> MARC structure
 - Administration -> Authority types -> MARC structure -> subfields
 - Administration -> MARC bibliographic framework
 - Administration -> MARC bibliographic framework -> MARC structure
 - Administration -> MARC bibliographic framework -> MARC structure -> Subfields
 - Administration -> Libraries and groups
 - Administration -> Cities and towns
 - Administration -> Classification sources
 - Administration -> Circulation and fines rules
 - Administration -> Currencies and exchange rates
 - Administration -> Item types
 - Administration -> Koha to MARC mapping
 - Administration -> System preferences -> Local use
 - Administration -> Z39.50 client targets

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-15 17:59:12 -03:00
Karl Menzies
97fa2c032e Bug 2889: template aqbasketusersearch add loop.odd
To Test
1/ In Acquisitions > Create a test Budget
2/ In the Budget > Create at least three Test Funds
3/ Create at least three Users who use the fund
4/ Select Search for Basket User
5/ In the Table results list see the list of users and see the alternate table highlighting

6/ Apply the patch
7/ Refresh the Search for Basket User results window
8/ In the Table results list see the list of users and see the alternate table highlighting in place
9/ Bug fixed

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-15 17:59:05 -03:00
842913dfb8 Bug 13052 - OPAC Cart JavaScript is included twice in the footer
The external JavaScript file which powers the OPAC Cart should not be
included twice. The correct instance is the one which comes after the
definition of MSG strings.

To test you must have the opacbookbag system preference turned on. In
Bootstrap OPAC, test adding some items to the Cart and confirm that Cart
operations work correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Cart is still working as expected, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-15 12:44:00 -03:00
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
6c34c8b650 Bug 7817: (followup) add test on MARC bibliographic framework test
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 12:29:38 -03:00
Marc Véron
e86371a0aa Bug 12835 - Acquisitions: Show search terms in z39.50 results
To test:

- Go to Acquisitions, select a bookshop and a basket, click 'Add to basket':'From an external source'
- Do a search
- Your search terms should display at the top of the results page.
- Repeat search with several combinations of search terms (with and without results).

- Check the output for correct html.

Fields Raw (any) and Standard ID removed / MV

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes QA script, works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:55:45 -03:00
25df10e4d8 Bug 12828: Update Z39.50/SRU online help
Test plan:
Go to Z39.50/SRU servers, click Help and read the text.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Additions to help file, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:54:17 -03:00
Marc Véron
6f64bb2bd5 Bug 12746 - Remove empty onclick attribute from memberentrygen.tt
This patch removes empty onclick attribute from memberentrygen.tt

To test:
Apply patch.
Use git grep 'onclick=""' to make sure that there are no more empty onlick attributes
Go to Home > patrons  and click 'New patron'
Check HTML of 'Cancel' link
Make sure that 'Cancel' link still works

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes the link to cancel adding a manual restriction.
No regressions found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:53:27 -03:00
0950e44faf Bug 12821: (qa followup) fix History -> Timeline on the help page
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:52:05 -03:00
efba7b02dd Bug 12821: Capitalization: about page fixes
This patch fixes several capitalization issues in the about page.

To test:
- Go to the about page
=> FAIL: you should see
   * Server Information (tab)
   * Koha Team (tab)
   * Koha Timeline (tab)
   * Additional Thanks To... (at the bottom of the Koha Team tab
- Apply the patch and reload
=> SUCCESS: you should see
  * Server information
  * Koha team
  * Timeline
  * Additional thanks to...
- Sign off :-D

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String changes, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:49:50 -03:00
Katrin Fischer
bbdcc4c927 Bug 12765: Fix capitalization - "Try another search"
To test:
- Go to cataloguing
- Perform a z39.50 search with no results
- Check "Try another search" is displayed
- Perform a z39.50 search with results
- Verify display is correct as well.

Signed-off-by: George Williams <georgew@latahlibrary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-08 10:49:31 -03:00
a8458630a7 Bug 12582 - Control of branch displayed in search results linked to HomeOrHoldingBranch
Some libraries would like the ability choose to display the home branch
on search results while having circulation rules based on the holding
branch. This is currently impossible because both the display of the
branch in search results, and the selection of the home or holding
branch for circulation rules are controlled by the same system
preference: HomeOrHoldingBranch. This preference is described as being
used only for circulation rules, and makes no mention of its use for
display control. The display control should be split off into a separate
preference.

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Note the value of the new system preference StaffSearchResultsDisplayBranch
   matches the current value of HomeOrHoldingBranch
4) Set the preference to home branch
5) Perform a staff catalog search with results having items with differing home and
   holding branches.
6) Note the home branch displays
7) Set the preference to holding branch
8) Repeat step 5
9) Note the holding branch displays

Signed-off-by: Jason Robb <jrobb@sekls.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, logic is now tied to a new system preference.
Passes tests and QA script.
2014-09-05 12:15:57 -03:00
38316529df Bug 8735 [QA Followup 2] - Remove extra period, add bug number to db update
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-05 11:51:09 -03:00
3b092a899f Bug 8735 - Expire holds waiting only on days the library is open
Signed-off-by: Leila <koha.aixmarseille@gmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-05 11:50:58 -03:00
51aba41fc3 Bug 6149 - Follow-up [syspref] - Stopwords for Result Highlighting
- global replaced HightedStopWords syspref with NotHightedWords for
  clarification purposes. Hopefully this is a bit better and still
  not too verbose.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, fixed some tabs and a typo.
2014-09-05 10:54:06 -03:00
dce2a6362c Bug 6149: Follow-up [grouped] - Stopwords for Result Highlighting
- Added functionaility to opac-results-grouped page

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2014-09-05 10:52:00 -03:00
500369d807 Bug 6149: Follow-up [bootstrap] - Stopwords for Result Highlighting
- Added functionality to new bootstrap theme

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2014-09-05 10:52:00 -03:00
Katrin Fischer
9e686e023f Bug 6149: Follow-up [defaults] - Stopwords for Result Highlighting
- changed sample words to and|or|not in sysprefs.sql and
  updatedatabase
- changed systempreference name from OpacHighlightedStopwords
  to HighlightedStopwords, as it also works for the staff
  results page

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2014-09-05 10:52:00 -03:00
db739ee578 Bug 6149 - Stopwords for Result Highlighting
This patch adds a system preference to control stopwords used to
prevent operators and other 'minor' words from being highlighted
in search results when the OpacHighlightWords syspref is enabled

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

Works as advertised, I fixed the updatedatabase to use XXX so it won't
clash as much

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a conflict in updatedatabase.pl.
Also fixed tabs in opac-detail.tt

Feature passes all tests and QA script now.
Tested in intranet and OPAC with different words and searches.
Works on results pages and OPAC detail page.
Highlighting and unhighlighting still works correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script, works as expected.
2014-09-05 10:52:00 -03:00
charles
c6716d3e22 Bug 7498 - Cloning a budget, enable change of description
Patch sponsored by the CCSR ( http://www.ccsr.qc.ca )

This new patch builds on the work of Bug 12164 by allowing the
user to enter a new name (budget_period_description) for the
cloned budget.

A test was added to t/db_dependent/Budgets.t.

Sponsored-by: CCSR

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
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>
Edit: added the sponsored-by line.
2014-09-05 10:21:30 -03:00
c14d91fcd0 Bug 12790: QA-follow-up: Mention required version in online Help
For those who would not understand the two version numbers and come up
with the idea to check the Help page, some text is added.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-05 10:16:27 -03:00
Marc Véron
27d3409598 Bug 12790 - Perl modules: Display required version numbers on about page
This patch adds information about required perl module versions to the
'About' page.

To test:
Apply patch.
In staff client, go to 'About', tab 'Perl modules'
The required version numbers should display in small print next to or
underneath the module names.

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>
2014-09-05 10:16:17 -03:00
Janet McGowan
56b4be2825 Bug 12866: Fixes Display of Email in Alternate Address
Incorrect display of Email Address in Alternate Address Patron Details

Without patch, mail from primary address is displayed in Alternate address
With patch, correct mail address is displayed
Signed-off-by: Marc Véron <veron@veron.ch>

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-03 14:16:14 -03:00
Chris Cormack
48e0107684 Bug 12205 : Add a system preference allowing hold charges to block circ
Currently, if you have holds charges, they are not taken into
consideration when circulating items.

Manual Invoices, and rental charges are governed by a systempreference

Holds are never counted

And all other charges (overdues, lost items etc) are counted

This patch adds a systempreference to allow Hold charges to be counted
as well.

To test

1/ Set a borrower category to have holds charges
2/ Place a hold for a borrower in that category
3/ Go to checkout, notice that charge is not showing or blocking on
that screen
4/ apply patch
5/ notice that charge now shows on checkout

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-09-01 12:57:10 -03:00
Jonathan Druart
19f2f0e776 Bug 12309: Adapt zipcode wording to match the other patron pages
Replace "Zip code" with "Zip/Postal code" which is used in
members/memberentry.pl and members/moremember.pl.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 11:07:09 -03:00
31847c7bd5 Bug 12309 - Add more fields to batch patron modification tool
It would be helpful to be able to use the batch patron modification tool
to update city, state, zipcode, and country. This patch adds this
functionality.

This patch corrects an error in the batch modification script which
would have incorrectly marked first name as required if surname was
required.

This patch also converts the table sorting configuration to use table
header class names instead of index-based sorting for columns containing
dates.

To test, apply the patch and submit a batch of patrons to the batch
patron modification tool (Tools -> Batch patron modification).

In the list of patrons which will be modified you should see columns for
city, state, zipcode, and country. Table sorting should work correctly
without errors, including the registration and expiry date columns.

In the list of fields which can be batch modified you should see inputs
for city, state zipcode, and country. These fields should correctly
reflect mandatory/not mandatory based on the BorrowerMandatoryField
system preference.

Submit batch changes to a variety of fields and confirm that changes are
applied correctly. On the page of results the table should correctly
show all fields and be sorted correctly.

Signed-off-by: cachan <pierre.lorgue@ens-cachan.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 11:07:01 -03:00
Liz Rea
ecab8f3dd2 Bug 12837 - barcode entry box out of alignment
To test:

Load up a circulation page, note that the middle of the barcode field doesn't line up with the Check-out button.
note that the date-select tickbox is also not aligned with the rest of the things on it's line

Apply the patch

Reload the page, verify that things are now in alignment.

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-01 10:58:16 -03:00
91d5a83849 Bug 6536: QA Follow-up for string changes referring to Z39.50
Z39.50 search now includes SRU targets.
This patch only touches strings referring to it.
No changes in behavior.
It replaces Z39.50 with Z39.50/SRU or external.

Deletes obsolete template z3950/searchresult.tt: not in use for some time.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 10:09:14 -03:00
8c7377d21d Bug 6536: Add XSLT transformation on Z3950 search results
Use the stylesheets listed in field add_xslt of z3950servers to transform
search results of Z3950/SRU search.
Additionally, the template has been changed to make more error messages (or
warnings) visible when displaying results. Until now, error message were
shown in the results table and when connection errors occurred, no results
were displayed at all.

Test plan:
Create some stylesheets (or see the sample patch on bug 6536).
Add these stylesheets to some Z3950/SRU servers.
Do Z3950 search and verify the transformations.
Do a search with 2 targets; make one target fail (by manipulating its server
data). Do you see the connection error and the results for the other target?
Generate a XSLT error by modifying one stylesheet. Check search results. You
should see warnings.

Signed-off-by: Giuseppe Angilella <giuseppe.angilella@ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 10:09:10 -03:00
5b0d410d2d Bug 6536: Adjustments for servername and servertype
Replaces name by servername, type by servertype for running Z3950 search.
Limit search scripts to zed (z3950) servers until sru is supported.

Test plan:
Perform a Z3950 search in Cataloguing and Acquisition.
Verify that it still works as it did.

Signed-off-by: Giuseppe Angilella <giuseppe.angilella@ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 10:09:05 -03:00
7748facfa5 Bug 6536: SRU servers administration
This patch makes adjustments in admin/z3950servers in order to insert,
edit and delete SRU server records.

Test plan:
Add, edit, copy and delete SRU server.
Check if adding, editing, copying and deleting Z3950 servers still works.

Signed-off-by: Giuseppe Angilella <giuseppe.angilella@ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 10:09:03 -03:00
88f26fa907 Bug 6536: Add a form for SRU Field mapping
This form allows you to enter the match between the standard names of
the Z3950 search fields and the field names for a specific SRU server.
This patch only adds the form; it will be used in a subsequent patch.

Test plan:
Not needed, but you can call the form by constructing a URL like:
    cgi-bin/koha/admin/sru_modmapping.pl?mapping=title=1,author=2
You should see the form with title and author filled.
Note that you cannot save the information yet.

Signed-off-by: Giuseppe Angilella <giuseppe.angilella@ct.infn.it>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-09-01 10:08:50 -03:00
4e1aaa4d58 Revert "Bug 12176 - Remove HTML from additem.pl"
This reverts commit 0033d287ba.

I made a mistake pushing this one before the UTF-8 work.
2014-08-27 08:24:44 -03:00
2bbb27c841 Bug 12325 - Marc and Card view in Z39.50 Results doesn't work properly in IE 8
This patch removes an unnecessary and problematic "return true" which
causes conflicts with Greybox when clicking on "MARC" or "Card" in
the search results of a Z39.50 search. The result is that the user is
taken to the showmarc.pl page and cannot return to the results, which
makes Z39.50 searching pretty much unusable for IE 8 users.

This patch also cleans up the "inline links" display for the separate
Z39.50 search pages. The 'biblio' version now has inline links for LCCN,
and the 'authority' version now prevents inline links for the MARC
and Import cells.

_TEST PLAN_

1) Open Internet Explorer 8 (if you don't have IE 8, use whatever Internet
Explorer version you do have. You can use F12 developer tools to emulate it.)
2) Go to Cataloguing > New from Z39.50
3) Do a search that will get results

(N.B. if you're using IE9+, hit F12 in the pop-up and change to IE 8 mode)

4) Click on "MARC" or "Card".
5) Note that Greybox tries to open a pop-over, but instead follows the
link to showmarc.pl. (If you're on IE 8, you can't use "Back" to go
back to the search results. If you're using an emulated version, you
can.)

(If you're testing the inline links, click on the LCCN cell for a biblio
search (not that no inline links appear), or MARC and Import cells when
doing an authority search (not that inline links do appear). Look at
bug 10096 for authority z39.50 server details.)

6) Apply the patch

7) Repeat steps 1-5
8) Note that Greybox now appears correctly when clicking "MARC" and
"Card"

9) Note also that inline links now appear for LCCN cell for biblio
searches, and inline links no longer appear for MARC and Import
cells when doing authority searches.

10) Profit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested for regressions in Firefox and Chromium, no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 15:11:51 -03:00
Bernardo Gonzalez Kriegel
0033d287ba Bug 12176 - Remove HTML from additem.pl
This patch removes HTML code from additem.pl

To test:
1. Chech no regressions on Add/Edit/Save items
2. Update translation files for a language,
check new string "Tag editor" on staff PO file
3. Check it pass xt/tt_valid.t

Rebased

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-08-26 15:09:30 -03:00
Jared Camins-Esakov
a537a60bd4 Bug 10402 follow-up: choose contacts for claims
This patch makes it possible to choose a particular contact for
acquisitions and serials claims. To test:

1) Select a contact to use for claiming late orders and a contact
   to use for claiming late issues.
2) Send a claim for a late order and a claim for a late issue.
3) Note that the claims went out to the proper people.
4) Run the unit test with:
    > prove t/db_dependent/Letters.t
5) Sign off.

Note: the claim messages are recorded in the logs in the *Acquisitions*
module, not the Letters module as you might expect

This patch also fixes several perlcritic violations and centralizes
contact-related unit testing in Bookseller.t.

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 11:45:59 -03:00
3b3656aa9d Bug 10402 [Template follow-up] Add multiple contacts for vendors
This template-only follow-up tweaks the button labels and restructures
the vendor view layout a little bit to make it more amenable to multiple
contacts:

- Add spaces after button icons
- Change "Add contact" to "Add another contact" in hopes of making it
  less ambiguous whether clicking it will submit the whole form.
- Eliminate duplicate headers on the vendor view page by making the
  contact name the subheading for each individual contact.

To test, view details for vendors with one or more contacts, and try
editing to add additional contacts. Everything should look good and work
correctly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 11:45:56 -03:00
Jared Camins-Esakov
b971273a10 Bug 10402: Add ability to enter multiple contacts
Some vendors may have more than one contact. For example, a technical
contact and a billing contact, or a contact for journals and a contact
for monographs. Rather than require that each contact be either made
into a separate vendor or recorded somewhere outside of Koha, it would
be really useful of Koha had the ability to add multiple additional
contacts to vendors in the Acquisitions module.

To test:
1) Apply patch.
2) Edit a bookseller, making sure to add a contact.
3) View the bookseller's information, making sure the contact
   information is there.
4) Run the unit test:
    > prove t/db_dependent/Bookseller.t
5) Add multiple contacts to a vendor, see that they show up.
6) Delete one contact from a vendor with multiple contacts,
   see that the result is correct.
7) Sign off.

Note: This test plan can supersede that on the previous two patches,
as all functionality of the previous two patches is required by this
one.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 11:45:52 -03:00
Jared Camins-Esakov
1d089b86f7 Bug 10402: Use an object for contacts
In preparation for adding the ability to handle multiple contacts, this
patch moves booksellers' contacts into their own class,
C4::Bookseller::Contact.

To test:
1) Apply patch.
2) Run database update.
3) Edit a bookseller, making sure to add a contact.
4) View the bookseller's information, making sure the contact
   information is there.
5) Run the unit test:
    > prove t/db_dependent/Bookseller.t

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 11:45:42 -03:00
c435ceb916 Bug 12718 - Show extended patron attributes in the OPAC
At some point the patron details page in the OPAC lost the display of
patron attributes. This patch returns the attributes to the update page.

To test, log in to the OPAC as a patron who has data in one or more
extended patron attributes. View the "your personal details" page
(opac-memberentry.pl):

- Confirm that the information displays correctly.
- Test with OPACPatronDetails both on and off.
- Test with patron who has no data in extended patron attributes.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Attributes only display when 'display in OPAC' is configured.
Attribute shows correct description, when authorised value is used.
Works as expected, updating is currently not yet possible.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 11:36:02 -03:00
Bernardo Gonzalez Kriegel
1e35ea33b0 Bug 12222: members-update.tt has a giant hash variable
This patch changes that giant hash by a TT block
to find apropriate strings

To test:
1) Apply the patch
2) On opac log as some user and request some modifications
on personal data
3) On staff, reload main, will see a notice that a patron
has requested modification, clic on the link
4) All modified data must show with apropriate legends
for each db column, check for regressions
5) Update translation files for your preferred language, xx-YY
Check for new strings, e.g.
egrep "Alternate address" misc/translator/po/xx-YY*
You must find old and new instances
(old with #~ , in particular the hash one)

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

Works as advertised, strings are now translatable.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I like to have this fixed. I'd like it to use C4::Templates::GetColumnDefs
instead, but it belongs to another bug report I guess.
2014-08-26 10:28:41 -03:00
f590ad7734 Bug 10212: (qa followup) accordion collapsed by default
By default, the accordion shows the first element (Acquisitions) which
is empty, and missleading. This patch collapses it by default.

The expected behaviour is that if we are rendering because the user saved
its changes, the modified accordion should be expanded, so I added a test
for the $panel variable.

Template comment added for future references about it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 10:26:50 -03:00
Jonathan Druart
b77a1c794f Bug 10212: Move colvis files to the include file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Implements the option to change the default columns that appear in
a table while giving the user the option to change the columns
individually for a session.

As an example, this feature is implemented for the currencies table.

Works well for all possible combinations in configuration.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 09:28:58 -03:00
Jonathan Druart
1108f2407d Bug 10212: Add Colvis to the about page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 09:28:51 -03:00
Jonathan Druart
23ccb9fd17 Bug 10212: Columns configuration for tables - POC
This patch proves that this feature is useful with a concret use case.

Test plan:
1/ Execute the updatedatabase in order to create the new table.
2/ Take a look to the yml structure.
3/ Go on the admin currency page (admin/currency.pl).
4/ Check that you cannot hide the 2 first columns on the table.
5/ Try to hide/show columns.
6/ Go on the columns configuration page (admin/columns_settings.pl).
7/ Only the admin tab are filled with data. Check/uncheck checkboxes and
save.
8/ Go on the admin currency page and check that the behavior is what
you expected.
9/ Give me some feedback :)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 09:28:44 -03:00
Jonathan Druart
9f1218ce4f Bug 10212: Columns configuration for tables - Add Colvis files
This patch only adds Colvis js and css files.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 09:28:31 -03:00
Jonathan Druart
ebf4e33cbf Bug 10212: Columns configuration for tables
This development introduces ColVis into Koha and provides a configuration
page for columns visibility.

ColVis is a plugin for DataTables. It allows to change the visibility of
the columns in the table.

* This development adds:
  - the js and css file for ColVis
  - a new DB table 'columns_settings'
  - a new template plugin 'ColumnsSettings'
  - a new package C4::Utils::DataTables::ColumnsSettings
  - a new admin page admin/columns_settings.pl

* How it works:
A yaml file is created (admin/columns_settings.yml) in order to take an
inventory of all tables where ColVis is implemented. This file is read
to create the list of modules, pages and tables in the configuration
page.
There are 3 possible keys in the yml:
 - is_hidden: default is 0
The column will be hidden.
 - cannot_be_toggled: default is 0.
ColVis will allow to hide/show the column.
 - cannot_be_modified: default is 0
Default values (in the yml) won't be modifiable.

When a user changes (or saves) the configuration for one module, all
columns are added to the DB table. The values in the DB get the upper hand
on the yaml values.

* Humm, strange?
It seems weird to have 2 storages for the same values. But I
think it will be easy to add an entry and maintain the yaml rather than
adding a new row (and new entry in updatedatabase script) in the DB.

* To go further: We can imagine that the configuration is saved for each
user (and not globally like it is made with this patch).

This patch cannot be tested as it, you need to apply the "POC" patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script, more comments on last patch.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-26 09:28:03 -03:00
Marc Véron
68bcac15d8 Bug 12744 - Set language in staff client should have 'Cancel' link
Test plan

Without patch:
Click on Library name in head of any staff client page anc choose 'Set library'
Result: Form 'Set library' with no 'Cancel' near 'Submit' button

With patch:
Form displays 'Cancel' link.
This link closes the form and takes you back to the page where you came from.

New patch without empty "onclick" attribute.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice patch, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-24 13:23:41 -03:00
07ae4a2fb5 Bug 7143: update the es-ES translation attribution as of 3.12 onwards
The currently maintained stable releases translations are/were done by
the following individuals and it should be acknowledged in the about page.

This patch also removes the venezuelian spanish translation, that was removed
long time ago.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2014-08-24 12:47:08 -03:00
44b3ad5e35 Bug 7143: Universidad Nacional de Cordoba is an institution that contributed to Koha
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2014-08-24 12:47:03 -03:00
81e34a5495 Bug 7143: Ohloh is now Open HUB
Ohloh.net links are used in the about page. Their FQDN has changed a while ago.
Old one is still redirected, but we need to fix it just in case the redirection
is removed.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2014-08-24 12:46:53 -03:00
cbd66ee847 Bug 7143: Full 3.18 release team acknowledged
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Missing the Module Maintainers?

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2014-08-24 12:46:41 -03:00
Katrin Fischer
ca0b0279fd Bug 12465: Improve display of MARC21 710 in intranet and OPAC
Currently, 710$a and $b and $b will not display correctly.
This patch tries to improve the display adding the missing
space between both subfields.

Please test.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested, work as described on staff & opac for 710 detailed view.
Add space and punctuation.
No errors.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-24 12:31:38 -03:00
Jonathan Druart
6d1b50682c Bug 12576: Update opac.css file
This file had a conflict. I prefer to put the changes in a specific
commit.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-22 11:13:09 -03:00
Sean Hamlin
25f901825c Bug 12576: Make the more/fewer options and "new search" links on the advanced search page look better.
How to test:
1/ Visit /cgi-bin/koha/opac-search.pl
2/ Assert the "More/Fewer options" buttons look like bootstrap default buttons
3/ Assert the "New search" button looks like a bootstrap default button
4/ Assert the visited colour of the buttons remains #333 (light grey)
5/ Assert the buttons still function as expected

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-08-22 11:13:02 -03:00
Katrin Fischer
baee536f19 Bug 12776: Capitalization: Confirmation messages in circulation
Changes:
- Yes, renew (Y)
- Yes, check out (Y)
- No, don't check out (N)
- No, don't renew (N)

To test:
- Verify changes by reading the code
- Check out an item that requires confirmation
  Example: Patron owes fines or test with bug 12776.
- Verify confirmation messages show up correctly.
- Check item out again to trigger renewal
- Verify confirmation message shows up correctly.

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-08-22 11:12:54 -03:00
c8bedf394f Bug 1561: Typo gut was not good; should be get !
The form method gut does not yet exist, even in Germany :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-21 09:56:43 -03:00
Mark Tompsett
cd8ca4717c Bug 4162 The inventory tool lacks validation for barcodes
The inventory tool had no form of validating on what was assumed
to be a valid barcode number.

To solve this, an extra loop to read before processing was added.
This allows to validate length and content. By using a check
of \p{Print}, this includes Unicode characters such as umlauts,
but excludes unusual control characters.

The template was modified to accomodate validation messages
related to the length and content errors. Additionally, it says
how many "barcodes" were read. Barcodes are supposed to be on
separate lines.

TEST PLAN
---------
1) Attempt to select a file which does not contain barcodes and
   is not a text file.
   -- a horrible lack of validation and spamminess ensues.
2) Apply patch
3) Create three files.
   a) One containing valid barcodes on each line
      -- this file should trigger no errors. Attempt a valid
         barcode with an umlaut.
   b) A copy of the first with an extra line of >20 characters
      (e.g. The Quick Red Fox Jumped Over The Brown Fence^A^B^C)
      -- this file should trigger the singular error message case.
         ^A^B^C are actually CTRL-A,CTRL-B,CTRL-C, and it is left
         as an exercise to the reader to add them to the line.
   c) A copy of the second with the last line duplicated
      -- this file should trigger the plural error message case.
4) Attempt each of the three files.
5) Run koha-qa tools.

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

I have a feeling that the column size could be better fetched from
Koha::Database. But it is an improvement in functionality signing off

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

Another thing for another day:
Empty lines are counted for the potential barcodes.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected, tried with arab strings, umlauts and no regressions found.
2014-08-20 17:55:11 -03:00
Marc Véron
97939b3a6b Bug 1561 - z39.50 results do not show search terms
This patch adds a line with search terms results window of z39.50 search.

To test:
- In staff client, go to cataloging.
- Click 'New from z39.50'
- Do a search
- Your search terms should display at the top of the results page.
- Repeat search with several combinations of search terms (with and without results).

- Check the output for correct html.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, fixed one tab.
Something similar would be nice for the results in the Z39.50 search
in acq as well.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-20 12:28:58 -03:00
4107444c03 Bug 12589 - Manage label batch view should show item type description instead of code
When viewing the list of items in an existing label batch the item type
code is shown. This patch modifies the template to show the item type
description instead.

To test, go to Tools -> Labels -> Manage batches. If necessary, create a
batch with multiple items of different item types. Edit the batch and
confirm that the table of items shows item type description instead of
code.

Signed-off-by: Robert Higgins <robert.higgins@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-19 12:44:55 -03:00
Bernardo Gonzalez Kriegel
deb22f01bb Bug 12704: Remove CGI::scrolling_list from unimarc_field_225a.pl
This patch removes the only instance in this file

To test:
1. Apply the patch
2. If you have UNIMARC, search for a record, edit it,
and go to tag 225
If you don't, edit your framework and connect this
pluging to some tag/subtag
3. Clic on the plugin link. If you don't have any record
that correspond to the search, can remove the commented
line to have something to play
4. The collection pulldown was replaced, check that works,
select a value and press Ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, tested according to test plan.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-19 12:44:03 -03:00
0c1c426986 Bug 12432 [QA Followup] - Make "All" tab work when switching back to it
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-08-19 09:54:33 -03:00