[koha-commits] main Koha release repository branch master updated. v16.05.00-1167-g33ff591
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 26 14:23:45 CEST 2016
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 "main Koha release repository".
The branch, master has been updated
via 33ff59173151dae282a3c787742128991a656290 (commit)
via d64de2bd0d4807700993727f3164fac1656c95b8 (commit)
via 2ae9f783534e7b0410869aafcb25f0c9dd6b2fa6 (commit)
via c541a967d6de9ebac94afa77e23bb99bf523de55 (commit)
via 9f91b2c1f18bf3165d6874774819d69541be4d58 (commit)
via ae893b792af98961b799d64407922afaef50fa96 (commit)
via 0db3058b02a6776452b6a6db11dae40f87276060 (commit)
via bbcb2fbeaf0e463dcb7960336f86dee61f1fb4d8 (commit)
via 628b78eda61e89499488396b683011a9c97d8309 (commit)
via 56e42bba232242ea9cb0fa23928c4d02647cdd97 (commit)
via 81a04af27804621609004dc370284413baa5caa2 (commit)
via bf1563e60b31244f4ea977eb84954fb8501ed59a (commit)
via d2a4c327466f448d2018b1dbf537d9f588d96604 (commit)
from c962285e40a9735e6559900fab0d3d619bca0fff (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 33ff59173151dae282a3c787742128991a656290
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 26 12:21:58 2016 +0000
Bug 14610 - DBRev 16.06.00.037
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit d64de2bd0d4807700993727f3164fac1656c95b8
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Oct 26 13:32:40 2016 +0200
Bug 14610: Follow-up 2
- Fixes typo "Recieve" in the sample notices
- Adds new notices to it-IT installer
- Turns off feature for existing installations, leaves it
on for new installations
- Fixes typo "cancelation"
- Fixes ids in <body> of new pages
- Adds/fixes classes in th elements of tables
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 2ae9f783534e7b0410869aafcb25f0c9dd6b2fa6
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri Oct 21 02:17:58 2016 +0000
Bug 14610 - Follow-up
Patch fixes some smaller problems:
- Adds new notices to the it-IT installer (xt/sample_notices.t)
- Renames one of the classes used in the table to avoid double up
- Fixes POD of Bilbio.pm by removing a doubled up line
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit c541a967d6de9ebac94afa77e23bb99bf523de55
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Oct 24 13:57:10 2016 +0000
Bug 14610 - Update Schema files
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 9f91b2c1f18bf3165d6874774819d69541be4d58
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Oct 11 08:46:14 2016 +0000
Bug 14610 [QA Followup] - Fix publishercode issue
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ae893b792af98961b799d64407922afaef50fa96
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Oct 11 08:15:37 2016 +0000
Bug 14610 [QA Followup] - Add classes to table headers
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0db3058b02a6776452b6a6db11dae40f87276060
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Oct 11 08:12:27 2016 +0000
Bug 14610 [QA Followup] - Add notices to all language files
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit bbcb2fbeaf0e463dcb7960336f86dee61f1fb4d8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 14 13:39:19 2016 +0000
Bug 14610 [QA Followup] - Implement staff patron tab
Also fixes a few other minor issues
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 628b78eda61e89499488396b683011a9c97d8309
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon May 16 11:21:28 2016 +0000
Bug 14610 - Update opac.css via less
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 56e42bba232242ea9cb0fa23928c4d02647cdd97
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 7 12:26:37 2015 -0400
Bug 14610 - Add unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 81a04af27804621609004dc370284413baa5caa2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 7 12:26:14 2015 -0400
Bug 14610 - Add and update scripts
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit bf1563e60b31244f4ea977eb84954fb8501ed59a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 7 12:23:24 2015 -0400
Bug 14610 - Add and update modules
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit d2a4c327466f448d2018b1dbf537d9f588d96604
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 7 12:22:12 2015 -0400
Bug 14610 - Add ability to place article requests in Koha - Update database
Article Requests are somewhat similar to holds, but are not requests for
an item to check out. Instead, article requests are requests for a
photocopy of a particular section of a book ( most often ). This is very
common in academic libraries where researchers may request a copy of a
single article found in a journal.
This patch set adds the ability to place article requests in Koha. It
allows the control of what can be requested via the circulation rules.
Since article requests of electronic resources are not outside the realm
of possibility, the feature will check not only the items for
requstability, but the record itself as well ( i.e. both items.itype and
biblio.itemtype ).
Article requests can be placed for patrons from the opac and staff
intranet and can be viewed in most areas where holds are viewed ( e.g.
patron details, record details, etc ).
There is a script to view article requests in progress within the
circulation module. Article requests can be Open ( i.e. new ), In
Processing, Completed, or Canceled. The status of a given request can be
updated from this script.
Test Plan:
1) Apply the patch set
2) Run updatedatabase.pl
3) Enable the system preference ArticleRequests
4) Set up some required fields in:
ArticleRequestsMandatoryFields
ArticleRequestsMandatoryFieldsItemsOnly
ArticleRequestsMandatoryFieldsRecordOnly
5) Edit your circ rules, set article requests to 'yes' for something
6) Test the ability to add an article request from the opac ( required fields enforced )
7) Test the ability to add an article request from the staff interface ( required fields no enforced )
8) Note you can choose item level or record level requests
9) Change the rule to "record only"
10) Repeat 6 and 7
11) Note you cannot choose items
12) Change the rule to "item only"
13) Repeat 6 and 7
14) Note you must choose an item
15) Note that the 'new request' message is queued for each new request
16) Browse to /cgi-bin/koha/circ/article-requests.pl
17) Note requests are split by pickup branch
18) Test slip printing via the "Print slip" action
19) Process request vai "Process request" action
20) Note an email notice is queued for patron
21) Refresh /cgi-bin/koha/circ/article-requests.pl
22) Note request has moved to "processing" tab.
23) Complete request with "Complete request" action
24) Note message is queued for patron
25) Cancel a request, add cancelation note.
26) Note message is queued for patron
Signed-off-by: Jennifer Schmidt <jschmidt at switchinc.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 25 +-
Koha.pm | 2 +-
Koha/ArticleRequest.pm | 223 ++
Koha/{Serial.pm => ArticleRequest/Status.pm} | 32 +-
Koha/ArticleRequests.pm | 103 +
Koha/Biblio.pm | 196 ++
Koha/Biblios.pm | 2 +-
Koha/Item.pm | 46 +
Koha/Patron.pm | 67 +
Koha/Patrons.pm | 81 +
Koha/Schema/Result/ArticleRequest.pm | 265 ++
Koha/Schema/Result/Biblio.pm | 19 +-
Koha/Schema/Result/Borrower.pm | 19 +-
Koha/Schema/Result/Branch.pm | 19 +-
Koha/Schema/Result/Issuingrule.pm | 18 +-
Koha/Schema/Result/Item.pm | 19 +-
Koha/Template/Plugin/Biblio.pm | 31 +
admin/smart-rules.pl | 2 +
.../article-request-slip.pl | 52 +-
.../article-requests.pl | 22 +-
circ/circulation.pl | 6 +-
circ/request-article.pl | 111 +
.../data/mysql/de-DE/mandatory/sample_notices.sql | 7 +
.../data/mysql/en/mandatory/sample_notices.sql | 7 +
.../data/mysql/es-ES/mandatory/sample_notices.sql | 7 +
.../mysql/fr-CA/obligatoire/sample_notices.sql | 7 +
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 7 +
installer/data/mysql/it-IT/necessari/notices.sql | 7 +
installer/data/mysql/kohastructure.sql | 34 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 13 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 7 +
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 7 +
installer/data/mysql/sysprefs.sql | 4 +
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 17 +-
installer/data/mysql/updatedatabase.pl | 54 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 6 +-
.../prog/en/includes/biblio-view-menu.inc | 7 +
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 +
.../prog/en/includes/patron-article-requests.inc | 91 +
.../en/modules/admin/preferences/circulation.pref | 43 +
.../prog/en/modules/admin/smart-rules.tt | 21 +
.../prog/en/modules/catalogue/detail.tt | 19 +
.../prog/en/modules/catalogue/results.tt | 4 +
.../prog/en/modules/circ/article-requests.tt | 409 +++
.../prog/en/modules/circ/circulation-home.tt | 5 +
.../prog/en/modules/circ/circulation.tt | 11 +
.../prog/en/modules/circ/request-article.tt | 380 +++
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 9 +
.../prog/en/modules/members/moremember.tt | 10 +
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2846 +++++++++++++++++++-
.../bootstrap/en/includes/opac-detail-sidebar.inc | 11 +
.../bootstrap/en/modules/opac-request-article.tt | 225 ++
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 99 +
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 18 +
mainpage.pl | 8 +
members/moremember.pl | 5 +-
...c-blocked.pl => opac-article-request-cancel.pl} | 25 +-
opac/opac-request-article.pl | 87 +
opac/opac-user.pl | 3 +-
svc/article_request | 63 +
t/db_dependent/ArticleRequests.t | 176 ++
tools/letter.pl | 4 +
63 files changed, 6027 insertions(+), 106 deletions(-)
create mode 100644 Koha/ArticleRequest.pm
copy Koha/{Serial.pm => ArticleRequest/Status.pm} (78%)
create mode 100644 Koha/ArticleRequests.pm
create mode 100644 Koha/Schema/Result/ArticleRequest.pm
copy course_reserves/course-details.pl => circ/article-request-slip.pl (52%)
copy rotating_collections/rotatingCollections.pl => circ/article-requests.pl (65%)
create mode 100755 circ/request-article.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt
copy opac/{opac-blocked.pl => opac-article-request-cancel.pl} (70%)
create mode 100755 opac/opac-request-article.pl
create mode 100755 svc/article_request
create mode 100755 t/db_dependent/ArticleRequests.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list