[koha-commits] updated branch master (d08cd6bfc0f8b30bfa9a98282d52325473fcecac)

Mon May 3 13:46:46 CEST 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Koha GitWeb".

The branch, master has been updated
       via  d08cd6bfc0f8b30bfa9a98282d52325473fcecac (commit)
       via  d575278cbaf59e0937632ae6abcc0eaca5852429 (commit)
       via  a445e956ebfec3ce932533f51c2ace19db49e1f7 (commit)
       via  2568e165e654c94e6a702e58e9d1d8241d551955 (commit)
       via  7bfd0461d4e4422027a244a985dafcf3df8f887c (commit)
       via  0c39f1ac9b5407b06357e1e936ea0d723da42367 (commit)
       via  96a70655aac0c96b82a77dd1e71eee7858d7a274 (commit)
       via  eb0196cda3f93eeb2289dd4e734ca9a9a1bf40b6 (commit)
      from  f90995bb963031462215353b4f7293930083789e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d08cd6bfc0f8b30bfa9a98282d52325473fcecac
Merge: 7bfd0461d4e4422027a244a985dafcf3df8f887c d575278cbaf59e0937632ae6abcc0eaca5852429
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Mon May 3 07:46:33 2010 -0400

    Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push

commit d575278cbaf59e0937632ae6abcc0eaca5852429
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 12:43:07 2010 -0400

    bug 4036, 4405: overdue and fine day block improvements

    * Adopted wording suggested by Kyle Hall for the
      USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
    * Updated IsMemberBlocked so that if a patron has accrued
      fine days, that will be tested for first before testing
      to see if the patron has current overdue items; this solves
      a problem introduced in the patch series for bug 4505 where
      accrued fine days would be ignored if (a) the patron has
      current overdue items but (b) the library has chosen to
      set the OverduesBlockCirc syspref to noblock.
    * Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
      blocks; prior to this patch, they had been swapped.

    FIXME: IsMemberBlock ought to be split into two functions

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit a445e956ebfec3ce932533f51c2ace19db49e1f7
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 12:08:17 2010 -0400

    bug 4429: do not include items due today in overdue count

    Use curdate() instead of now() in GetMemberIssuesAndFines.

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 2568e165e654c94e6a702e58e9d1d8241d551955
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 11:58:23 2010 -0400

    bug 4036: do not count item overdue if it is due today

    * use curdate() instead of now() to test whether item is overdue
    * enhanced POD of IsMemberBlocked

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 7bfd0461d4e4422027a244a985dafcf3df8f887c
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 14:32:44 2010 -0400

    bug 4396: remove reerences to bi_notforloan

    These were causing the OPAC details place hold button to disappear
    in circumstances where a bib-level item type was set to a non-loanable
    item type even when item-level_itypes was on.

    This change does mean that if item-level_itypes is not turned on,
    the hold button will now appear for bibs whose bib-level item type
    has its not-for-loan flag set; however, if this is a problem, a
    better long-term fix would be to use CanBookBeReserved() instead.

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 0c39f1ac9b5407b06357e1e936ea0d723da42367
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 14:15:42 2010 -0400

    simplify logic for displaying item status

    Flatten the tmpl_if tree for determining the item status
    to display and tweaked the order in which statuses are checked to

    1. (circ reality) item on loan
    2. (circ reality) item in transit
    3. (circ reality) item wating at hold shelf
    4. (item status that makes circ impossible) item withdrawn
    5. (item status that makes circ impossible) item lost
    6. (policy that implies no circ but in-house use possible) item not-for-loan per item
    7. (policy that implies no circ but in-house use possible) item not-for-loan per item type
    8  (item status that *might* affect circ) damaged
    8. (fallback) item available

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 96a70655aac0c96b82a77dd1e71eee7858d7a274
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 14:02:32 2010 -0400

    bug 4396: clarify return of itemtype-level notforloan flag

    * GetItemsInfo now includes a notforloan_per_itemtype key
      with the value of the item type's notforloan setting, correctly
      set based on the value of the item-level_itypes syspref
    * Adjusted OPAC details item status display to use that
      notforloan_per_itemtype key

    NOTE: one of the assumptions of item-level_itypes is that
          you can have either bib-level item types or item-level
          item types, but not both in the same database.  In particular,
          it does not establish a hierarchy where Koha checks the
          item-level itemtype first, then the bib-level.

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit eb0196cda3f93eeb2289dd4e734ca9a9a1bf40b6
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat May 1 13:40:20 2010 -0400

    bug 4396: create new OPAC template include for item status

    As part of preparing to work on bug 4396 (item level item types not
    working correctly when biblioitem-level item type is not for loan),
    moving the item status template logic to a separate include to make
    it easier to work with.

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                                  |   22 ++++----
 C4/Items.pm                                        |    2 +-
 C4/Members.pm                                      |   57 ++++++++++++--------
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    3 +-
 .../prog/en/modules/circ/circulation.tmpl          |   12 +++--
 .../opac-tmpl/prog/en/includes/item-status.inc     |   32 +++++++++++
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |    2 -
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |    2 -
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |   37 +------------
 9 files changed, 90 insertions(+), 79 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc

hooks/post-receive
-- 
Koha GitWeb