Commit graph

12719 commits

Author SHA1 Message Date
89cda847a1 follow-up to reports permissions patch
* Enforce the requirement that the user must have the
  create_reports permission in order to delete a saved report;
  closes hole where unprivileged user could delete reports
  by constructing a URL maliciously
* Added another tweak of the template - don't offer option
  to create a new report if the user doesn't have permission.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:50 +13:00
Paul POULAIN
637e5c6713 MT4578 : remove edit & delete button if the user don't have edit/create report permission
(includes some reindenting, there are only a few <!-- TMPL_IF name="CAN_user_reports_create_reports" --> added

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:37 +13:00
Jean-André Santoni
4bd6188816 Fixes a permission problem in guided reports
missing s
create_reports
and execute_reports
rather than
create_report
and execute_report

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:23 +13:00
311d958bbb follow-up: improve use of home and holding library in circ stats report
[1] Actually make use of home/holding library if set
[2] Use current terminology - "library", not "branch"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:03 +13:00
Alex Arnaud
51d4e749d5 (MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:59 +13:00
d866282bb9 Removed two column definitions added in previous patch
The items table has neither a date_due nor issueddate
column.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:34 +13:00
Paul Poulain
84dbc926c0 MT2268 : Guided Reports Fix columns.def
Reports Guided : removing \n when reading columns.def
Adding some more fields to columns.def

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:03 +13:00
1aef81c354 Ukranian and Russian syspref language updates 2010-11-09 12:01:02 +13:00
a3226d5ce6 Russian and Ukranian opac language updates 2010-11-09 12:00:40 +13:00
6d22b87543 Staff interface .po file updates 2010-11-09 11:59:41 +13:00
Chris Cormack
2a4c3d48d0 Merge remote branch 'kc/new/bug_5370' into kcmaster 2010-11-09 10:49:01 +13:00
Katrin Fischer
d829dc1c6a Bug 5370: Fix all references to koha.org
Thx to Brooke for helping with the wiki.

This is the last patch.
We will have to change some more links, after translate.koha.org was moved.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-09 10:45:27 +13:00
Chris Cormack
ce54fe0323 Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster 2010-11-08 19:42:41 +13:00
a3ceef434e Bug 4515 (Few very small errors in opac-search.pl) RESENT fixing whitespace warning
Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 16:51:54 +13:00
c616cb5081 Bug 4472 Apply it to MARC21
For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 16:23:37 +13:00
Chris Cormack
fe977aa441 Merge remote branch 'kc/new/bug_5214' into kcmaster 2010-11-08 15:31:49 +13:00
fbbab73492 Fix for Bug 5214 - undefined itype images cause broken image icon in request.pl
Also fixes the same bug on the Itemtypes administration page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 15:30:17 +13:00
Chris Cormack
f48cb1122d Merge remote branch 'kc/new/bug_5236' into kcmaster 2010-11-08 15:26:37 +13:00
c49600aaa7 bug 5236: remove hidemytags from CSS as well
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 15:25:29 +13:00
072896d66b bug 5219: tidy cleanup_database.pl
Includes a bit of cleanup of the enhancement patch
for bug 5074 - adding comments about old and new
behavior isn't necessary for such small changes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 15:14:15 +13:00
Chris Cormack
4a86a4de8c Merge remote branch 'kc/new/bug_5370' into kcmaster 2010-11-08 09:42:52 +13:00
Katrin Fischer
6df634855c Bug 5370: Fix all the references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:41:49 +13:00
Katrin Fischer
9f688ad92b Bug 5370: Fix all references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:41:47 +13:00
Chris Cormack
44b3ac1196 Merge branch '5370_koha.org' of git://github.com/kfischer/Koha into new/bug_5370
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:31:46 +13:00
07cfc5d69c Bug 5372 (v2) Existing value can be replace by default value
The way an existing value was tested was wrong. 0 is a valid value but a
false value for Perl.

=> replace privious proposal.

[3.2] Should also apply.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:24:22 +13:00
Katrin Fischer
35cf30ef15 Bug 5370: Fix references to koha.org and other old websites
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-07 19:50:52 +13:00
Katrin Fischer
2f16504e9a Bug 5370: Fix references to koha.org and other old websites 2010-11-07 07:10:06 +01:00
Chris Nighswonger
8dded0c269 Adding 3.2 Release Maintainer to Release Team List
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-06 20:44:17 +13:00
e40b180d1d Bug 5368 Browse Shelf link appears when no itemcallnumber
Suppress Browse Shelf link on OPAC detail page when there is no item
call number.

[3.2] Should also apply on 3.2

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-06 07:39:48 +13:00
Nahuel ANGELINETTI
363c1ca9f9 (MT 2985) simplify CanBookBeReserved
The function was too complex for so simple stuff, not we check if one of all items of the record can be issued.

[Note by Galen Charlton: not only does this patch simplify the routine,
 it also makes it behave correctly.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-06 07:14:13 +13:00
Chris Cormack
b2fa851cca Merge remote branch 'kc/new/bug_5227' into kcmaster 2010-11-05 08:02:34 +13:00
Chris Nighswonger
374cdb2678 Fixing up a regexp to stop a trivial warn 2010-11-04 14:24:46 -04:00
Chris Cormack
414b2ace4f Merge remote branch 'kc/new/signoffs' into kcmaster
Conflicts:
	installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number
2010-11-04 20:14:28 +13:00
Chris Cormack
c836b63a7d Bug 5363 - Removing unused module (C4::Cache::FastMemcached)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 20:05:36 +13:00
be997f924e bug 4141: fix upgrade of OPAC XSLT parameters from 3.0.x
Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 06:54:04 +13:00
Chris Cormack
47391d4e5a Updating version number and fixing the xxx in updatedatabase ... my bad 2010-11-04 06:28:24 +13:00
Chris Cormack
78a1f58275 Merge remote branch 'kc/new/bug2567' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 21:21:36 +13:00
Chris Cormack
e5bdc1e9ab Merge remote branch 'kc/new/bug_5308' into kcmaster 2010-11-03 16:52:21 +13:00
Chris Cormack
5145eb59b7 Merge remote branch 'kc/new/merge_help' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 14:58:52 +13:00
Chris Cormack
ef087b0006 Merge remote branch 'kc/new/bug_4991' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 14:49:13 +13:00
Chris Cormack
ae6ae0b39d Merge remote branch 'kc/new/bug_5301' into kcmaster 2010-11-03 06:54:50 +13:00
dev2
433b77b750 Bug 5192 Enhancement to add new index for 658 curriculum field
Creates new curriculum index for 658 subfields a,b,c and search option in Advanced search (under More Options).  Also modifies the installer files to make 658abc display (they were hidden in the frameworks) and to create the new indexes.

The 658 already displays as part of the staff/OPAC subject display line.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 21:02:12 +13:00
9bd16d23b2 bug 5243: avoid crash when saving authority records on certain setups
This does not seem to occur on all platforms - C4::Search
exports SimpleSearch() by default - but adding the 'C4::Search::'
qualifier certainly doesn't hurt things.

Patch by Fridolyn Somers <fridolyn.somers@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 16:13:27 +13:00
b96617dea8 bug 5149: follow-up - remove extraneous character in link
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:46 +13:00
Nicole Engard
36df1f6cdf bug 5149 fix broken link to noItemTypeImages preference
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:45 +13:00
Nicole Engard
140fde57de bug 5110 move NewItemsDefaultLocation to cataloging tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:44 +13:00
51405bcce4 Fix for Bug 4963, sys prefs need date hints and/or picker
This patch adds the standard date format hint used elsewhere
in the interface.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:40 +13:00
ByWater Solutions
321eed9833 Bug 4254 - adding new patron advanced notice doesn't save
This was due to poorly constructed SQL which returned duplicate values for
certain fields. This patch corrects that SQL.

NOTE: There is also a formatting problem with the message prefs display table
when it is displayed in moremember.pl. This is due to there being no logic to
tell the table in that context to display checkboxes as appropriate. This patch
does not fix that. Bug 5328 has been opened for this problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:35 +13:00
b0e29e5595 Fix for Bug 5082 - Not translatable name of default framework 'Default' in MARCdetail.tmpl
This patch also fixes an unreported bug where switching from any
other framework to 'Default' would bring up no MARC data.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:16:51 +13:00
bd28366523 Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable
Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:16:50 +13:00