[koha-commits] main Koha release repository branch master updated. v3.20.00-480-g9f01706
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 28 15:41:11 CEST 2015
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 9f0170668c628fb9119495891c67fe1358a93609 (commit)
via a2844a8a5c8ae39a82a0d876a2d5ef02ca237089 (commit)
via 3389e03035dc6b187045e279dc34916b005afbfb (commit)
via 991a8181b29c2fec4fe50b45328a27c78a60f3c4 (commit)
via fa1311894906821e2b6bc9e4e3a831a855a20bca (commit)
via 9b2e4d966684d509ac64b4d83835c1d6d8992dd2 (commit)
via 16a83aa7a64db6c9c28bb3d11817aaf4e51bdee7 (commit)
via acc8de8214c6f8c342eb170c9ddd2be63c16354b (commit)
via a5beeb365e21e8417b456f013b4bcdf3e21b1aa3 (commit)
via 6d73e951beb376d47245a8a0dbc35db82a158fee (commit)
from f9e24c8d4f2de5dd697a2d99c6e36cb59463920e (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 9f0170668c628fb9119495891c67fe1358a93609
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 25 12:47:57 2015 +0100
Bug 14337: Add 2 more tests to be complete
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a2844a8a5c8ae39a82a0d876a2d5ef02ca237089
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 25 12:39:33 2015 +0100
Bug 14337: Fix conflict with bug 9809
The reserves.constrainttype does not exist anymore, it has been removed
by bug 9809.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3389e03035dc6b187045e279dc34916b005afbfb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 5 07:50:26 2015 -0400
Bug 14337: AllowRenewalIfOtherItemsAvailable counts holdable not for loan items when checking renewability
AllowRenewalIfOtherItemsAvailable checks
C4::Reserves::IsAvailableForItemLevelRequest to see if the item is
holdable, which catches not for loan values less than 0 ( i.e. holdable,
but not circ-able ). However, since this feature is about
actually checking out items to patrons, we should not count *any* not
for loan items when deciding if the available items will satisfy all
current holds.
Test Plan:
1) Enable AllowRenewalIfOtherItemsAvailable
2) Create a record with two items
3) Check out one item to a patron
4) Ensure the item is renewable
5) Place a hold on the record
6) The item should now be non-renewable
7) Add a second item to the record, but with a not for loan value < 0
8) Note the checkout is still renewable
9) Apply this patch
10) Note the checkout is now non-renewable
Works ok.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 991a8181b29c2fec4fe50b45328a27c78a60f3c4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Aug 20 06:46:51 2015 -0400
Bug 14337: Add Unit Tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit fa1311894906821e2b6bc9e4e3a831a855a20bca
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date: Tue Aug 25 07:24:54 2015 +0000
Bug 14703: Holidays description shows \r\n for every new line
Adds a new line for the holiday's description instead of the string
\r\n.
Test plan:
1. In tools -> Calendar look at some holiday's description
(Do a new holiday with description of multiple lines if
there is not already)
2. Notice that there is characters \r\n if someone has put
a newline in the holiday's description
3. Apply patch
4. See that the new lines show there now nicely
Sponsored-by: Vaara-kirjastot
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended slightly: no need to replace title.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9b2e4d966684d509ac64b4d83835c1d6d8992dd2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 28 10:36:11 2015 -0300
Bug 11584: DBRev 3.21.00.21
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 16a83aa7a64db6c9c28bb3d11817aaf4e51bdee7
Author: Martin Persson <xarragon at gmail.com>
Date: Mon Aug 17 00:01:05 2015 +0200
Bug 11584: Syspref WYSIWYG, dropdown added
This patch adds the 'Htmlarea' type to the dropdown box
introduced by bug 14268, commit 6e3bcc38.
Sponsored-By: Halmstad County Library
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit acc8de8214c6f8c342eb170c9ddd2be63c16354b
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jul 14 17:02:17 2015 +1000
Bug 11584: Introduce UseWYSIWYGinSystemPreferences syspref
This patch adds a system preference "UseWYSIWYGinSystemPreferences" to the Staff Client tab.
By default, it is off, which means that the TinyMCE WYSIWYG editor won't be shown for system
preferences with a type of "htmlarea".
However, when it's on, it will show the editor for "Local Use" preferences with a "htmlarea"
type, and for other system preferences in the "Opac", "Circulation", and "Staff Client" tabs,
which I have re-assigned. (Basically, I grepped for HTML and changed the type for all
the system preferences I found except for "IntranetNav", "OpacCustomSearch", and "OPACSearchForTitleIn",
as a WYSIWYG editor would potentially break the output for these system preferences or
add no value to them...)
_TEST PLAN_
0) Run `perl installer/data/mysql/updatedatabase.pl` after setting your environmental variables
1) Check the Opac tab to make sure that the WYSIWYG is nowhere to be seen
2) Change the "UseWYSIWYGinSystemPreferences" preference in "Staff Client" to "Show"
3) Refresh the Opac tab and notice that many system preferences now have a WYSIWYG editor
4) Try typing some text into these fields
5) Note that it gets marked as "modified"
6) Save the preference, and refresh the page
7) Note that the content has been saved
8) Take a look at how it's rendered on the actual webpage!
Signed-off-by: Martin Persson <xarragon at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a5beeb365e21e8417b456f013b4bcdf3e21b1aa3
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jul 14 14:17:48 2015 +1000
Bug 11584: Add TinyMCE license to about.pl
This patch adds the TinyMCE license info to about.pl
Signed-off-by: Martin Persson <xarragon at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 6d73e951beb376d47245a8a0dbc35db82a158fee
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jun 23 17:36:58 2015 +1000
Bug 11584: Add wysiwyg editor to system preferences dealing with HTML
This patch adds the ability to use a WYSIWYG editor for system preferences.
The key files that I touch are:
1) admin/systempreferences.pl
2) koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
3) koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
I also add:
4) koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
and
5) koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage
This plugin is part of the TinyMCE distribution. It used to be in Koha, but
then someone removed it. It's useful for preferences like "opacheader" though.
*If you're using anything except IE, this should work super well. If
you're using IE, it'll probably only work for keyboard input and dragging
text within the editor box but not from outside of it. IE has worse
security, so you can probably paste using the context menu paste.
*While I think a WYSIWYG editor can be useful, there might be times
where the content is displayed differently than it is in the editor
because of higher level CSS and Javascript.
Signed-off-by: Martin Persson <xarragon at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 1 +
Koha.pm | 2 +-
admin/systempreferences.pl | 5 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 12 +-
.../lib/tiny_mce/plugins/advimage/css/advimage.css | 13 +
.../lib/tiny_mce/plugins/advimage/editor_plugin.js | 1 +
.../tiny_mce/plugins/advimage/editor_plugin_src.js | 50 +++
.../lib/tiny_mce/plugins/advimage/image.htm | 235 ++++++++++
.../lib/tiny_mce/plugins/advimage/img/sample.gif | Bin 0 -> 1624 bytes
.../lib/tiny_mce/plugins/advimage/js/image.js | 464 ++++++++++++++++++++
.../lib/tiny_mce/plugins/advimage/langs/en_dlg.js | 1 +
.../prog/en/includes/wysiwyg-systempreferences.inc | 61 +++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +
.../prog/en/modules/admin/preferences.tt | 13 +-
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 22 +-
.../en/modules/admin/preferences/staff_client.pref | 8 +-
.../prog/en/modules/admin/systempreferences.tt | 24 +-
.../prog/en/modules/tools/holidays.tt | 2 +-
t/db_dependent/Circulation.t | 97 +++-
21 files changed, 990 insertions(+), 26 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/css/advimage.css
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin_src.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/image.htm
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/img/sample.gif
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/js/image.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/langs/en_dlg.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list