[koha-commits] main Koha release repository branch master updated. v3.20.00-959-g4b5e92c
Git repo owner
gitmaster at git.koha-community.org
Tue Oct 27 20:28:40 CET 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 4b5e92c51c2aeb2157d8d4065a6ab433707bb8dc (commit)
via 9da25ce34c7e9d8a31e0148f076bfa3621fcec25 (commit)
via 1f15b585d486c6cd53086442f248b29bbe6b1e13 (commit)
via 269deb2e33dce6cc21a0db9a93f2b095dcd08f6d (commit)
via c7082e4fee931328a1aa83f950de9d259fa12719 (commit)
via ed0ac0cf2d292486d59960c7244746174343c36b (commit)
via c5094de789a0b37266c292e1ec3ffb4ae7a02101 (commit)
via 4d719fb20f846585a8e1f1bb4bea085b1ccb1f32 (commit)
via b0f9b34a542ea1d8a339a9170bff78e080aac009 (commit)
via 4d7e251c8828a42de3b4e48290e22d158eac0353 (commit)
via b3721f71ea084234d67c8671d2314ca4861b2c77 (commit)
via 34818c05d561d0caf02f432129c455bf20e1e69d (commit)
from 7bde40a2d5de2db4213f57716ea852be167fe89a (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 4b5e92c51c2aeb2157d8d4065a6ab433707bb8dc
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Oct 24 13:09:41 2015 +0200
Bug 12428: QA Follow-up: Wrap borrower's title in a span to make it possible to hide
I think showing the title with the user name is quite unusual for
Koha. Wrapping the title in a span with a unique class makes it
possible to hide it.
http://bugs.koha-community.org/show_bug.cgi?id=14248
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9da25ce34c7e9d8a31e0148f076bfa3621fcec25
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Oct 22 08:52:33 2015 -0400
Bug 14248: Regression tests
TEST PLAN
---------
1) apply patch
2) prove -v t/db_dependent/NewsChannels.t
3) run koha qa test tools.
Signed-off-by: Martin Persson <xarragon at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1f15b585d486c6cd53086442f248b29bbe6b1e13
Author: Martin Persson <xarragon at gmail.com>
Date: Fri Oct 2 08:06:06 2015 +0200
Bug 14248: Optionally display authorship for news
Test plan:
* Apply dependant patches 14246 and 14247.
* Apply current patch.
* Log into the Staff client, go to
'Administration' -> 'Global Preferences' -> 'Tools',
a new section titled 'News' should appear with a single option named 'NewsAuthorDisplay'.
Available values should be 'Not at all', 'OPAC only', 'Staff client only' and
Both OPAC and staff client'. By default the value should be 'Not at all'
(to mimic existing behaviour, important!).
* Change the value to something different and save the changes.
* Go to 'Tools' -> 'News' and add some news items (at least 2).
* Use the MySQL command line tool to edit the opac_news table,
removing the user id from one of the news items:
$ mysql -u kohaadmin -p -D koha
> SELECT `idnew`, `title`, `borrowernumber` FROM `opac_news`;
* Make a mental note of one of the 'newid' numbers to change.
> UPDATE `opac_news` SET `borrowernumber` = NULL WHERE `idnew` = <your-id-here>;
* Now one of the news items will have no user id, and no author should be shown for it.
* Go to OPAC and Staff client and make sure the display modes works as intended.
* Repeat for all values, making sure that the settings works as intended.
* The changed news item should have no author info shown at any time.
* The unchanged news item should show your own user name if the
settings match the section where it is displayed.
Sponsored-By: Halland County Library
Tested on top of Bugs 1246 and 1247, works as advertised.
Note: Some whitespaces changed / removed in koha-news.tt to pass qa tools.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 269deb2e33dce6cc21a0db9a93f2b095dcd08f6d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 27 16:12:51 2015 -0300
Bug 14247: DBRev 3.21.00.046
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c7082e4fee931328a1aa83f950de9d259fa12719
Author: Martin Persson <xarragon at gmail.com>
Date: Tue May 26 15:58:45 2015 +0200
Bug 14247: Rename sysprefs atomic update file
This trivial patch changes the name of the SQL update
file to match the guidelines on the wiki.
Sponsored-by: Halland County Library
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit ed0ac0cf2d292486d59960c7244746174343c36b
Author: Martin Persson <xarragon at gmail.com>
Date: Mon May 25 14:33:13 2015 +0200
Bug 14247: Add system preference for news display
Test plan:
* Apply dependant patch 14246 (if not done already).
* Apply current patch.
* Log into the Staff client, go to 'Administration' -> 'Global Preferences' -> 'Tools', a new section titled 'News' should appear with a single option named 'NewsAuthorDisplay'. Available values should be 'Not at all', 'OPAC only', 'Staff client only' and 'Both OPAC and staff client'. By default the value should be 'Not at all' (to mimic existing behaviour, important!).
* Change the value to something different and save the changes.
* Use the mysql command line client to connect to the Koha database:
$ mysql -u kohaadmin -p -D koha
* Enter the following query:
SELECT * FROM systempreferences WHERE variable = 'NewsAuthorDisplay';
* Check to make sure that the 'value' column has changed to reflect the choice you made in the above step.
Separate SQL testing (clean installation of Koha):
* Koha$ mysql -u root < create_koha_test_db.sql
* Koha$ mysql -u koha_test -D koha_test < installer/data/mysql/kohastructure.sql
* Koha$ mysql -u koha_test -D koha_test < installer/data/mysql/sysprefs.sql
Testing the update script works the same way:
* Koha$ echo "DELETE FROM systempreferences WHERE variable = 'NewsAuthorDisplay';" | mysql -u koha_test -D koha_test
* Koha$ mysql -u koha_test -D koha_test < installer/data/mysql/atomicupdate/add_news_prefs.sql
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c5094de789a0b37266c292e1ec3ffb4ae7a02101
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 27 16:02:33 2015 -0300
Bug 14246: DBRev 3.21.00.045
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4d719fb20f846585a8e1f1bb4bea085b1ccb1f32
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Oct 21 19:55:08 2015 -0400
Bug 14246: Adding Koha::Schema::Result differences
Ran misc/devel/update_dbix_class_files.pl as shown on
wiki/Database_updates#updatedatabase.pl
However, only git added Borrower and Opacnews, since
those were the two affected by this patch.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b0f9b34a542ea1d8a339a9170bff78e080aac009
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Sun Jun 14 17:39:52 2015 +0530
Bug 14246: (fix) correct ALTER TABLE mysql syntax
Address bug 14246 comment 13 remark - correcting MySQL ALTER TABLE
syntax.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4d7e251c8828a42de3b4e48290e22d158eac0353
Author: Martin Persson <xarragon at gmail.com>
Date: Mon Jun 1 13:56:56 2015 +0200
Bug 14246: Update NewsChannel tests
This commit adds the new 'borrowernumber' field to the existing
test framework to make it pass. It does not include new tests.
Sponsored-by: Halland County Library
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b3721f71ea084234d67c8671d2314ca4861b2c77
Author: Martin Persson <xarragon at gmail.com>
Date: Wed May 27 07:36:33 2015 +0200
Bug 14246: Add borrowernumber, altered SQL
As suggested by kind reviewers, an AFTER statement was added to the atomic
upgrade script to ensure that the final field order is consistent is both
fresh and upgraded databases.
Also:
* UPDATE action changed to CASCADE to improve robustness.
Test plan:
* Apply first patch in this set.
* Apply this patch.
* Perform a database upgrade.
* Use mysql client to inspect field order.
It should be identical to the kohastructure.sql order.
Sponsored-by: Halland County Library
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 34818c05d561d0caf02f432129c455bf20e1e69d
Author: Martin Persson <xarragon at gmail.com>
Date: Tue May 26 13:23:34 2015 +0200
Bug 14246: Add borrowernumber to koha_news
This patch adds a new column to koha_news that links a
borrowernumber to each item. This allows Koha to display the
author for each entry which makes it suitable as a simple CMS.
Changes (from rejected patch):
* Added missing kohastructure.sql changes.
* Turned the atomic update file into a SQL file and changed name
in accordance with wiki guidelines.
* Changed SQL syntax and naming to be consistent with existing code.
* Attached test plan to commit message.
Test plan:
* You need at least one news item, log in and add one from
'Administration' -> 'Tools' -> 'News'.
* Apply the patch.
* Apply database upgrade (directly or indirectly).
* Go back to Staff interface and post a new news item.
* Use the mysql command line client to connect to the Koha installation's database:
mysql -u kohaadmin -p -D koha (change username and database to values
appropiate for your system).
* Execute the following query: SELECT title, borrowernumber FROM opac_news;
* Inspect the results, the 'borrowernumber' column should be NULL for all news items
created before the patch was applied, and non-NULL for the new item created AFTER
the patch was applied.
Optional: Remove database changes via:
ALTER TABLE opac_news DROP FOREIGN KEY borrowernumber_fk;
ALTER TABLE opac_news DROP COLUMN borrowernumber;
Sponsored-By: Halland County Library
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/NewsChannels.pm | 14 +++-
Koha.pm | 2 +-
Koha/Schema/Result/Borrower.pm | 19 ++++-
Koha/Schema/Result/OpacNews.pm | 32 ++++++++-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 28 ++++++++
.../prog/en/modules/admin/preferences/tools.pref | 10 +++
.../prog/en/modules/help/tools/koha-news.tt | 4 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 4 +-
.../prog/en/modules/tools/koha-news.tt | 2 +
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 +-
t/db_dependent/NewsChannels.t | 76 +++++++++++++++++++-
tools/koha-news.pl | 1 +
14 files changed, 186 insertions(+), 12 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list