Commit graph

619 commits

Author SHA1 Message Date
da2040634e Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:43:04 +13:00
Nicole Engard
b7fdfc1384 bug 4131 have subscription so edit routing if one exists
Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 12:13:34 +13:00
98efac4c0a Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library
I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 15:35:09 +13:00
1b344bdbd1 Fix for Bug 4984, Invalid XHTML in staff client search results
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 05:25:29 +13:00
562653bc8d Fix for Bug 3918 - Add to order lists inconsistent
- Added new include to contain add to basket options
- Minor markup corrections

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:46:07 +13:00
6a61750bf0 Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 21:54:18 +13:00
Robin Sheat
980de26320 bug 5045 - Help works even when the referrer is being stripped
This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:20:01 +13:00
f5b416b5bb Bug 5530 Follow up
With this patch, I don't see any other place where the old sysprefs editors
(systemprefences.pl) is used anymore.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-22 11:27:55 +13:00
Henri-Damien LAURENT
77426c9ef1 MT4009: followup removing systempreferences
searching a systempreferences was disabled owed to the fact that it is now systempreferences which is used.
2010-12-21 21:18:11 +13:00
080f693c48 Fix for Bug 5513 - staff client display screwy if you don't have all permissions
The cause of this bug was the removal of a closing <!-- /TMPL_IF -->
in a recent commit.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:40:21 +13:00
Paul POULAIN
78038d3cf6 fixing unopened closed tmpl_if
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:22:10 +00:00
Nicolas Morin
dade9a2a24 correct vocabulary
in GUI, changes technical vocab like "string" to proper user-friendly terms like "Title"

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:11:33 +00:00
21c516601c Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:38:52 +13:00
Nicole Engard
a6799f95fb bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:16:32 +13:00
bd7cca935b Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.

Revised for current HEAD

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:10:57 +13:00
Katrin Fischer
c6a9141413 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.
2010-12-13 08:01:41 +01:00
cb969684da Fix for Bug 5285, Show/hide columns in the output of items in batch operations
Also adds title/author information to output of batch deletions

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:45:30 +13:00
e29a123a9b Fix for Bug 2808, Hold queue not alphabetizing
White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:30:06 +13:00
1024eceec7 Fix for Bug 5048, Error in menu/submenu for select language in intranet
Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:24:34 +13:00
083d3b1a92 Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:38:43 +13:00
bd90bb02a4 Corrected patch for Bug 4520, facets "show more" doesn't work
Re-doing Nahuel's fix so that it applies to master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 20:20:42 +13:00
4b69538f9b Fix for Bug 4913 - Budget pages should show currency name instead of symbol
This patch adds a new include file to handle the display of the active
currency name and a warning if no currency is active.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-15 15:13:55 +13:00
d9de6ebab3 Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:34:45 +13: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
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
Nicole Engard
d5eb56dd52 bug 5019 remove link to funds
This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 14:50:02 +13:00
Chris Cormack
f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
8893e38c6e remove unused template include
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:23:57 +13:00
Chris Cormack
8af6165f53 Merge remote branch 'kc/new/background_jobs_tested' into kcmaster 2010-11-01 21:03:06 +13:00
Srdjan Jankovic
e2e1dfd86e bug 5309: Adjust progres bar
Also added some test facilities
wr73785

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 11:20:34 -04:00
Srdjan Jankovic
3a4f36b002 bug5027: skip unticked checkboxes when submitting in the background.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 11:20:32 -04:00
Chris Nighswonger
3169100d51 Bug 5227 [3.4] Enhance the label batch edit interface
This patch adds the ability to enter items into label batches via
barcode scanning

Work sponsored by Tamil - http://www.tamil.fr

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 09:03:54 -04:00
Colin Campbell
9e5366734b Bug 5315: Remove references to obsolete variable nbstatements
Trying to see the wood from the trees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:39:18 -04:00
c0fedbab3c remove last vestiges of NOTMARC mode
MARC, the metadata exchange format for the 20th century!

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 21:06:52 -04:00
Bernardo Gonzalez Kriegel
587cacee7b Misspells: deleteing -> deleting
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:51:34 -04:00
6b88131f80 defer rotating collections
Disabling rotating collections for 3.2.0 release; after more testing,
candidate for 3.4 as well as backport into 3.2.1.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 21:12:20 -04:00
Katrin Fischer
f53f20bd6f Bug 5013: Advanced patron search category pull down broken
The pull down for category in patron's advanced search was only showing any and no patron categories.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 12:19:50 -04:00
fb5412c529 Fix for Bug 4849 - Cannot delete records from Labeled MARC view
The template checks for a "count" variable (item count) to see
whether it should allow deletion of the biblio record. For some
reason labeledMARCdetail.pl hard-coded this as 1, which meant
the template always thought was 1 item.

This patch also adds an item count check on the display of
"Delete all items," disabling it if there are no items.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:16:48 -04:00
40d9995822 Fix for Bug 5101, Creators tab isn't highlighted when selected
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:14:26 -04:00
Jared Camins-Esakov
9f7f61be4a Fix Bug 5261 broken link in Local Use sysprefs
This patch eliminates the sysprefs-menu.inc include file and changes the
systempreferences.pl and systempreferences.tmpl files to work with the
prefs-menu.inc instead. This will centralize the syspref tabs and make it
easier to modify tabs in the future if necessary.

This commit also changes the default tab to Acquisitions, since the Local Use
tab does not work with preferences.pl at present.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:44 -04:00
cf3c2fadeb Fix for Bug 4996 - Untranslatable strings in budget/fund toolbar
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-20 16:11:29 -04:00
Chris Nighswonger
141313666f Bug 3756: Adding the ability to have localuse systempreferences
Squashed commit of the following:

commit d42198bfadff20f40c38b3d9bc7f210ecc372e7c
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:48:16 2010 -0400

    Bug 3756 [4/?] new sys prefs - no way to add a new local use preference

        Fixing Global Administration link

commit 060a52bc8d9da1d83387455967ca05292e5987b9
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:45:07 2010 -0400

    Bug 3756 [3/?] new sys prefs - no way to add a new local use preference

        Hiding non-local sysprefs

commit d63858e13037fa91f18bc248ab770d757e31153c
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 16:44:40 2010 -0400

    Bug 3756 [2/?]new sys prefs - no way to add a new local use preference

        Fixing a typo

commit 5b23a615018e049b1e11dbc10b131ecb30dfc6ab
Author: Chris Nighswonger <cnighswonger@foundations.edu>
Date:   Mon Jul 12 15:52:04 2010 -0400

    Bug 3756 new sys prefs - no way to add a new local use preference

        A quick and dirty fix

Signed-off-by: Chris Cormack <chrisc@catalyst.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 23:29:30 -04:00
3452d0f267 Fix for Bug 5013 "New patron" menu button broken on patron select screen
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 22:05:19 -04:00
d3ece118f1 bug 4808: allow limited-permission circ operators to print receipts
Staff users now only need circulation privileges to print
checkout receipts and slips; the 'borrowers' permission, which
allows editing patron records, is no longer required.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 14:57:25 -04:00
a9c90b6dfb Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:54:54 -04:00
Chris Cormack
ac5047b887 Follow up patch, removing missed conflict marker
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:50 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
c6b94ab730 Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:25:43 -04:00
Nicole Engard
c4f7259cc1 bug 4205 remove extra 'plan by' option
There wasn't a conditional in place to stop the planning
pull down from showing a blank 'plan by' option.

This patch also makes the other 'plan by' options look
cleaner by removing the all caps.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:04:23 -04:00
Nicole Engard
8f1a6ad3de bug 4027 fix testStatus typo to textStatus
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:52:29 -04:00