Commit graph

1580 commits

Author SHA1 Message Date
Galen Charlton
9f2c77a686 bug 2000 - fix order of issuingrule lookup
Extended help on the alternate circulation rules
form to list the order of issuingrules lookup as
follows:

same library, same patron type, same item type</li>
same library, same patron type, default item type</li>
same library, default patron type, same item type</li>
same library, default patron type, default item type</li>
default library, same patron type, same item type</li>
default library, same patron type, default item type</li>
default library, default patron type, same item type</li>
default library, default patron type, default item type</li>

This includes modifying two routines in C4::Circulation to
follow this order: GetLoanLength() and GetIssuingRule().

The reason for this change is to have Koha exhaust all issuingrules
possibilities for a branch before checking the rules for
the default branch - this is consistent with what an admin
might expect from looking at the issuingrules forms, which display
settings a branch at a time, and is more consistent with how
circulation rules should work for indepdendent branches.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
3e9a94c546 bug 2000 - alternate issuing rules - set sorting of rules
Issuing rules are now explicitly sorted by patron category,
then item type.  The default patron category sorts last; within
a list of item types for a given patron category, the default
item type sorts last.  This follows the order in which
the issuing rules are applied.

Since the primary sort is patron category, also moved that
to be the first column in the issuing rules table.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:03 -05:00
Galen Charlton
d6934ca397 bug 2000 - alternate issuing rules - some form cleanup
Improvements to smart-rules.pl to allow it to
replace issuingrules.pl.

* standardized "borrower type" to "patron category"
* made default item type and patron category ('Any')
  translatable
* regularized construction of parameters for rule
  deletion operatrion

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 08:19:00 -05:00
paul
5314a32914 adding string for translator
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:56 -05:00
paul
827203132c movin patron flags to template to have translatable strings
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:50 -05:00
paul
867788e8cf escaping field to deal with quotes in shelf name
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-20 06:12:49 -05:00
Galen Charlton
fff5631fc7 bug 2262 - fix delete guarantor button
Added an ID attribute so that the JavaScript
for the 'delete guarantor' button could
clear the guarantorid field.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-19 20:45:44 -05:00
Andrew Moore
6e52709824 Bug: 2259: eliminate lines too long for git to use.
This patch modifies 13 HTML templates and includes that have lines in them longer than 998 characters. Lines this long are known to break git.

I believe that none of these change behaviour at all, but I'm concerned about one of them. It adds whitespace (carraige returns) inside a <title> tag. I'm not certain that all browsers will deal with this OK.

No documentation changes necessary here.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-18 19:25:52 -05:00
Joshua Ferraro
6c9b83fbdc Resolves bug 2250: RFC: New System Preference to Determine which 'Types' and associated icons to display in advanced Search
For documentation, please indicate that as part of profiling,
staff can refer to the AdvancedSearchTypes system preference to
choose where to draw the advanced search 'Types' from. Currently
this is implemented as a choice, between itemtypes and ccodes,
but it's been designed to work with any authorised value so long
as an index exists for searching by that authorised value.

By default, and if this syspref doesn't exist, it will pull from
itemtypes as before.
2008-06-18 13:01:20 -05:00
374a07a5d2 Adding missing menu item for Stop Words. Fixes Bug 1995, "Link Missing from Admin Menu."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:53:20 -05:00
64d65d838a Restructuring guarantor display to address Bug 2220 ("Guarantor needs two fields to be labeled"). This change probably means an updated screenshot is necessary.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:52:52 -05:00
37e4866b5b Correction to allow pop-up window to scroll. fixes Bug 2209, "Editing records in the inventory."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:51:49 -05:00
ac7c215be3 Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:53 -05:00
904a148509 Markup correction. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:50 -05:00
5697bef959 Removing redundant column. Fixes Bug 2202, "No need for View Column on Authority Search"
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:58 -05:00
6729244bb5 Terminology correction (fixes Bug 2200, "Mislabeled Column on Overdues Report")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:37 -05:00
691bcc631c Markup corrections to cataloging pages; Fixes for Bugs 2166 (" Book Jackets Not Showing on My Summary"), 2194 ("No results for Authority Search Shows blank record"), and 2196 ("Extra comma being added to record display")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 08:31:09 -05:00
Ryan Higgins
6b6dd30170 Spelling correction in template.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-16 10:24:25 -05:00
Galen Charlton
ee49d6d372 kohabug 2207 - improve indicator input in MARC editor
Instead of having one input field for both indicators
of a variable field, the bib and authority MARC editor
now has an input field for each indicator.  This has
two main advantages:

* it is easier to tell what the indicator values are,
  even when the first indicator is a space
* it is easier to set the first indicator to blank
  and the second indicator to non-blank.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-12 11:17:35 -05:00
Galen Charlton
d351753d4e kohabug 1993 - task scheduler improvements
[1] Removed hardcoded path to original developer's
    Koha configuration file; now checks KOHA_CONF.
[2] Now attempts to figure out if a task was successfully
    added to the task queue; if it wasn't, the failure
    is now reported in the  task scheduler page.
[3] When traveling to the task scheduler page from a
    saved report, the report in question is now
    selected by default.
[4] Removed the button to edit a queued task; this is
    not supported.

This patch is essentially a bandage; I've added a BUGS
section and some FIXMEs to the POD for C4::Scheduler
detailing some issues - a refactoring of the task
scheduler is in order at some point.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-09 06:38:03 -05:00
Chris Nighswonger
105b70e502 Correcting "Open" to read "Free" on shelves.pl in order to match pull-down selections
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-09 06:37:58 -05:00
Ryan Higgins
5dd5b0be33 Remove vestigial checkbox for label-batch creation on MARC import
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:35 -05:00
Ryan Higgins
d4dd393e20 Update issues_stats to use authorised_values instead of distinct(sortn); add col/row headers as Descriptions instead of codes.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:34 -05:00
Ryan Higgins
0e31981100 Update issues_stats to show auth_vals as row & column headers
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:33 -05:00
Ryan Higgins
98bc024609 Add Collection code limit to issues_stats report.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:30 -05:00
Ryan Higgins
fc99bfcbb1 Update issues_stats: add shelving location limit, replace cgi::scrolling_list, update terminology.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:29 -05:00
Galen Charlton
68d89cf3e1 bugfix - HTML escape syspref explanation
This applies to the list of system preferences in
the syspref editor - the OPACUserCSS syspref had
angle brackets in its description.

Used template change to accomplish this.  Note that
syspref value is escaped by the script, note the template.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:46:15 -05:00
Joe Atzberger
1bb1d04f3f Convert to using loop_context_vars for rows instead of highlight/toggle/whatever.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:43:21 -05:00
Joe Atzberger
0855e8ef29 Show copy/volume info on STAFF detail page.
This change helps the staff side catch up w/ the OPAC display and be
more useful to librarians dealing with serials.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:43:17 -05:00
Joe Atzberger
797c1d5502 Bugfix is_approved() to handle the 3-state nature of approval.
That is, a term is either approved, or rejected, or neither.
Without an external dictionary, most terms will fall into the
latter category.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:41:40 -05:00
Paul POULAIN
6fc3c7cd9d display itemnote on check-out (added, was not here) & check-in (red-ed, was already here)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-03 06:04:14 -05:00
Ryan Higgins
938f053cbb Add MARC preview to cataloguing search, and add a link to add holdings. Once the edititems permission patch is accepted, this page should be updated to require edititems instead of editcatalogue.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-03 06:00:51 -05:00
Joe Atzberger
1d6078adea Correction to: Comment out confirmation popups (on successful events).
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-03 06:00:46 -05:00
Joe Atzberger
47fa74d68f Comment out confirmation popups (on successful events).
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-03 06:00:45 -05:00
Galen Charlton
28fb7a6c19 kohabug 2180 - improve display when fines block checkouts
If a patron's fine balance is over the limit set by the
noissuecharges syspref, checkouts are blocked.  However,
this was not made very clear in the interface.

Improved the display by doing the following:

[1] If the fine balance is over the noissuecharges limit, use the "blocker"
styling (i.e., make all of the text red).
[2] Add wording to explicitly signal whether or not the fine balance is
blocking charges.

Documentation changes: new screenshots of blocked checkouts.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:37 -05:00
Ryan Higgins
34b4e77507 Independent-branchify MARC export. Add option to remove all holdings except your own, and force that behavior for independent branches. Also add accession date limit to export.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:35 -05:00
Ryan Higgins
fc98d228c2 Sort dropdowns for libraries by name instead of branchcode in several staff-side interfaces.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:33 -05:00
3cb28152bb Items from Bug 2167 ("URL handling in staff client inconsistent"): Removing display of URL from moredetail.pl. URLs are now displayed on detail.pl just as they are in the OPAC. Also removing display of biblio-level call number. Item level call number is displayed already.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:53 -05:00
Joe Atzberger
ff604d4a8a Printers code paring, related to bug 2045. This does not resolve the bug,
but it converts the template to using loop_context_var, and removes unused
variables from the script.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:46 -05:00
Joe Atzberger
4073b27c50 Wrap up Tags integration - add sysprefs for new installs.
Note that when the user is not logged in, the Tags input box/button will not display.
The user will see a message telling them to log in to add tags.  However, in order to
keep the results display clean, the message will display only once, utilizing the loop
context variable "__first__".  Useful stuff!

I also threw OPACShelfBrowser sysprefs.sql, but it still needs added to updatedatabase.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:12 -05:00
Galen Charlton
57fb7e45b7 kohabug 2186 - improve display of empty import batches
[1] Display the "No records have been staged" message only
    if no import batches exist.
[2] When displaying a batch that has no bibs in it, display
    a "There are no records in this batch to import".  Also,
    do not display the "import record into catalogue" button
    for an empty batch.
[3] Add CSS class "problem" to both messages.

Documentation changes: minor; only required if screenshots
exist of the manage staged MARC records page that has no
import batches on it.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:03 -05:00
Paul POULAIN
7979f28cc0 add borrower note to check-in
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 12:00:16 -05:00
Paul POULAIN
df050c4c58 enhance the patron note on check-out (was not enough visible, now is red)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 12:00:07 -05:00
Paul POULAIN
6600ea28bb change in button description to explain that we will import into catalogue
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 11:49:35 -05:00
Joshua Ferraro
5f6af04ee1 nomenclature cleanup: s/Branch/Library/ s/Document Type/Item Type/ 2008-05-30 11:36:04 -05:00
Joe Atzberger
a5f90c7d68 Repair Labels code to accomodate patroncards. Purged EXPR.
Major FIXME's still remain, like the use of GET instead of POST.
The code is also a bit too INCLUDE-happy to net good performance.
The entire mechanism of adding to a batch should probably be proper
AJAX instead of the GET-centric opener.location approach.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 10:01:08 -05:00
c4072c8fe9 Fixing some typos, including, I believe, Bug 2174 ("spelling error in web installer")
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 10:01:07 -05:00
Galen Charlton
94d3d63f3a kohabug 2164 - display of guarantor relationship
When editing a child or professional patron, display
the drop-down of relationship types only if at least
one relationship type is defined by the borrowerRelationship
syspref.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-29 07:06:44 -05:00
Joe Atzberger
d6a92d6dc0 Make printslip and printpage buttons use popup.
This bug was reported by existing users.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-29 07:04:46 -05:00
Joe Atzberger
8ff0dc1a65 Correct typo "printslilp" to "printslip"
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-29 07:04:44 -05:00