[koha-commits] main Koha release repository branch master updated. v3.14.00-671-gc095003
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 7 19:54:09 CEST 2014
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 c095003b865a9405014d8567bdccfaf7048fd929 (commit)
via c3c07d93760afa4eada4ee7080f273d53990dcd8 (commit)
via d49ae54b953b50ffdbf0635f995c4e8a796fdd01 (commit)
via 8d4d4550aa01645bb4f565857597b81a33f046c2 (commit)
via ab47d48488f65cca08871bff69a1561e10740945 (commit)
via ea6cffdd9f04bd855f9b763776d44ae4702a8116 (commit)
via 53f15f678f3e64156f9c969b3b019a73e9691cbd (commit)
via 49381cc45bef043c104e848aa536fa8c58f4e3da (commit)
via b4c3f23c0bfe4d55fc3bd171585070c9420027b9 (commit)
via 2f2a0cf53e64a02f65cc0797bdcf6c0fd9a8dc2a (commit)
via d3eaa627176d3945888da33082bfb12e05e5ee25 (commit)
via beb74124f292954b727231290f44d27f5565a5cf (commit)
via 1094f7fefe59457cd2e689969e58ee6ddc84e44a (commit)
via 82a36947f72c542dae4edd967291e7ffe7d8b037 (commit)
via 8a9bfd0a1c17cb5dc4b1e9cbd6cb79b349fe9c1b (commit)
via b56f09229956b964db36567a49c139e138867b97 (commit)
via a6213abe019bf05b92a0df765cf4e3200dd3b42a (commit)
from 04e4fc9751332f08ada8da7814652dcddbee72c9 (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 c095003b865a9405014d8567bdccfaf7048fd929
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 7 18:10:38 2014 +0000
Bug 7567: (follow-up) construct values clause in SQL statement more idiomatically
To test:
[1] Verify that prove -v t/db_dependent/NewsChannels.t passes
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c3c07d93760afa4eada4ee7080f273d53990dcd8
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 7 17:45:44 2014 +0000
Bug 7567: (follow-up) make tests of get_opac_new more readable
This patch updates two of the tests cases to directly compare
the results returned by get_opac_new with the expected value
by using is_deeply(). Consequently, it removes the use of magic
numbers (which do not stop being magic numbers if they're wrapped
in constants named F1, F2, etc.).
To test:
[1] Verify that prove -v t/db_dependent/NewsChannels.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d49ae54b953b50ffdbf0635f995c4e8a796fdd01
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 7 17:01:18 2014 +0000
Bug 7567: DBRev 3.15.00.027
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8d4d4550aa01645bb4f565857597b81a33f046c2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Mar 27 09:30:24 2014 -0400
Bug 7567: (follow-up) Modify DataTables configuration
This follow-up corrects a JavaScript error by converting the sorting
configuration to be class-based
(http://wiki.koha-community.org/wiki/DataTables_HowTo#Sorting_dates_regardless_of_date_format_preference).
I have also changed the DataTables configuration to allow for pagination
and JS-based filtering.
To test, apply the patch and view the list of News items. Your browser
should report no JavaScript errors. Table sorting, pagination, and
filtering should work correctly.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ab47d48488f65cca08871bff69a1561e10740945
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 27 13:15:14 2014 +0100
Bug 7567: QA followup: remove useless $parameters hashref
This hashref is useless, it is only used once.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ea6cffdd9f04bd855f9b763776d44ae4702a8116
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 27 13:14:08 2014 +0100
Bug 7567: QA followup: FIX SQL query
The WHERE clause should not erase $query.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 53f15f678f3e64156f9c969b3b019a73e9691cbd
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Dec 19 22:59:28 2013 -0500
Bug 7567 - Use, display, filter News by library
This adds the ability to specify whether staff, OPAC,
or slip news entries apply to all libraries or just a
particular library.
With the branch parameter added to key functions in
C4/NewsChannels.pm, function calls in C4/Members.pm,
mainpage.pl, opac/opac-main.pl, tools/koha-news.pl, and
t/db_dependent/NewsChannels.t were needed.
Some license texts were updated.
Templates were modified to display, allow for entry and editing
of the branches selected.
TEST PLAN
---------
1) Having logged into the staff client, is the news displaying
correctly? Have you entered a news item which should not
display for this branch of logged in user?
2) Find a patron (with some items checked out?)
3) Print a slip
- News which is labelled 'All Branches' or for the same branch
as the one printing the slip should display on the slip.
- THIS DOES NOT AFFECT QUICK SLIPS
4) Home -> Tools -> News
- Can you edit a news item?
- Does the change save correctly?
- Can you filter based on location and branch correctly?
- Can you add a new entry correctly?
- Can you delete an entry correctly?
5) Open an OPAC client.
- Does only the news for all branches display?
6) Log into the OPAC client.
- Does the news for all branches and the specific branch display?
7) prove -v t/db_dependent/NewsChannels.t
- Does it run and all succeed?
- Does the code seem to catch the required cases?
8) Comparing the patched and unpatched versions of files affected,
are the license changes missing anything?
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 49381cc45bef043c104e848aa536fa8c58f4e3da
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Feb 16 22:40:28 2014 -0500
Bug 7567 - Schema update for opac_news
This was generated by:
Reset hard to master.
Restore old DB
Apply the patches for 7567
./installer/data/mysql/updatedatabase.pl
./misc/devel/update_dbix_class_files.pl -db_name=... -db_user=... -db_passwd=...
git add Koha/Schema/Results/OpacNews.pm
This should provide the necessary changes to the schema files for
Koha 3.16 and forward.
Had to generate under Debian, because Ubuntu's was broken by comparison.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b4c3f23c0bfe4d55fc3bd171585070c9420027b9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Dec 19 17:51:34 2013 -0500
Bug 7567 - Added branchcode to opac_news
This patch merely adds branchcode varchar(10) DEFAULT NULL to
the opac_news table.
TEST PLAN
---------
1) backup your kohadata base if you care about the data.
2) use the koha database
3) describe opac_news;
4) show create table opac_news;
-- No branchcode constraint will exist.
5) apply the patch
6) upgrade the database (either staff client or script)
7) use the koha database
8) describe opac_news;
9) show create table opac_news;
-- The branchcode constraint should be listed.
10) drop that koha database
11) create the koha database
12) use the koha database
13) source ~/kohaclone/installer/data/mysql/kohastructure.sql
-- there should be no errors in creating the database.
14) describe opac_news;
15) show create table opac_news;
-- The branchcode constraint should be listed.
16) restore your koha database if you backed it up.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2f2a0cf53e64a02f65cc0797bdcf6c0fd9a8dc2a
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Dec 16 00:41:47 2013 -0500
Bug 7567: convert news add/update routines to take hashref; fix bugs
Changed the add and update functions to use a hash reference
for the parameter, so that adding or subtracting parameters
should be easier. Added some POD for the add_opac_news and
upd_opac_news functions, so that developers would know how to
call it.
The hashref changes resulted in being able to return 0 for
failure and 1 for success. This meant adding a couple tests
to the test file.
And while testing, there was some sort of logic problem with
the matter of '' being all, but selecting all only showed
things set for all, and excluded particular languages, or other
interfaces.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d3eaa627176d3945888da33082bfb12e05e5ee25
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun Dec 15 22:33:32 2013 -0500
Bug 7567: (code cleanup) remove finish calls
"When all the data has been fetched from a SELECT statement,
the driver will automatically call finish for you. So you should
not call it explicitly except when you know that you've not
fetched all the data from a statement handle and the handle
won't be destroyed soon."
(http://search.cpan.org/~timb/DBI-1.627/DBI.pm#finish)
All the $sth variables were scoped within the functions,
and would be destroyed immediately. Additionally, there was
one after a SELECT, for only a single idnew, and so it was
not necessary.
TEST PLAN
---------
1) prove -v t/db_dependent/NewsChannels.t
2) apply patch
3) prove -v t/db_dependent/NewsChannels.t
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
ok 1 - use C4::NewsChannels;
ok 2 - Successfully added the first dummy news item!
ok 3 - Successfully added the second dummy news item!
ok 4 - Successfully updated second dummy news item!
ok 5 - Successfully tested get_opac_new id1!
ok 6 - Successfully tested get_opac_new id2!
ok 7 - Successfully tested get_opac_news!
ok 8 - Successfully tested GetNewsToDisplay!
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit beb74124f292954b727231290f44d27f5565a5cf
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 13 22:12:37 2013 -0500
Bug 7567 - Correct Filtering and Default dropdown values
In the staff client, when you went to Home -> Tools -> News
the default 'Display location' is 'All'. Everything is correctly
displayed. However, if you change the filter it filters the
table correctly, but does not set the dropdown value to match.
This patch corrects this.
TEST PLAN
---------
1) Home -> Tools -> News
2) Change 'Display location' value and click 'Filter'.
- Is the 'Display location' value the same now?
(no)
- Are the correct values displayed?
3) Click 'New entry'
- Is it anything other than 'All'?
(no, and is this correct?)
4) Click 'Cancel'
5) Click 'Edit' for various news items with different locations.
- Does the 'Display location' get proper set?
(no)
6) Apply patch
7) Change the 'Display location' value and click 'Filter'.
- Does the 'Display location' value stay the same?
(this should be correct now)
- Are the correct values displayed?
8) Change the 'Display location' value to 'All' and click 'Filter'.
- Does everything display?
9) Change the 'Display location' value and click 'Filter'.
10) Click 'New entry'
- Does it match what the filter was?
(should match now)
11) Click 'Cancel'
12) Click 'Edit' for various news items with different locations.
- Does the 'Display location' get proper set?
(this should be correct now)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 1094f7fefe59457cd2e689969e58ee6ddc84e44a
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 13 16:17:04 2013 -0500
Bug 7567: (code cleanup) remove excess line
The template parameter { $lang => 1 } does not seem used in
master. It is unconfirmed whether this is used in earlier
versions of Koha.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 82a36947f72c542dae4edd967291e7ffe7d8b037
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 13 15:51:36 2013 -0500
Bug 7567 - Clean up sample news files
Some files had truncate. Some files had foreign key checks.
Other files had foreign key checks disabled. Some files gave
the column names expressly, and others assumed the fields in
a particular order. Everything was modified to:
- not truncate
- not say utf8 (because it should already be by default)
- not disable foreign key checks (because it should work)
- expressly name the fields (adding fields shouldn't break it)
TEST PLAN
---------
0) Backup opac_news if you care about your news.
1) open mysql client
2) use the koha database
3) Run the following script
TRUNCATE opac_news;
source ~/kohaclone/installer/data/mysql/uk-UA/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/it-IT/necessari/sample_news.sql
source ~/kohaclone/installer/data/mysql/de-DE/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/nb-NO/2-Valgfritt/sample_news.sql
source ~/kohaclone/installer/data/mysql/en/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/pl-PL/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/es-ES/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/ru-RU/optional/sample_news.sql
source ~/kohaclone/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql
- Were there errors?
- Did everything add nicely?
- Not likely, by expressly stating the idnew field, the news
items in some files would not be added.
4) apply patch
5) try running the script again
- Were there errors?
- Did everything add nicely?
6) Log into the staff client
7) Tools->News
- Do you see the news items added?
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Much needed clean up, making for much more robust and less error prone
sql
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8a9bfd0a1c17cb5dc4b1e9cbd6cb79b349fe9c1b
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 13 15:13:49 2013 -0500
Bug 7567: (code cleanup) update License tools/koha-news.pl
Updated license text using
http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
for the base text.
TEST PLAN
---------
1) less tools/koha-news.pl
2) apply patch
3) less tools/koha-news.pl
- was any contributor information lost?
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Safe no op action
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b56f09229956b964db36567a49c139e138867b97
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 13 14:49:56 2013 -0500
Bug 7567: (code cleanup) update license and use Modern::Perl
Grabbed the current license from
http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
and changed the use strict; use warnings; into a
use Modern::Perl instead.
TEST PLAN
---------
1) Log into staff client.
- Does news look okay?
2) Apply patch
3) Refresh staff client.
- Does news look the same?
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Safe no op action
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a6213abe019bf05b92a0df765cf4e3200dd3b42a
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Dec 12 23:19:18 2013 -0500
Bug 7567: add tests for C4::NewsChannel
Testing was lacking, this tests every function call. As a
side effect, this moved the stub of a test file from
t/NewsChannels.t to t/db_dependent/NewsChannels.t, since the
table opac_news must exist.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Passes all 8 tests
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Members.pm | 2 +-
C4/NewsChannels.pm | 182 +++++++++++++-------
Koha/Schema/Result/OpacNews.pm | 35 +++-
.../data/mysql/de-DE/optional/sample_news.sql | 4 +-
installer/data/mysql/en/optional/sample_news.sql | 4 +-
.../data/mysql/es-ES/optional/sample_news.sql | 4 +-
.../data/mysql/fr-FR/2-Optionel/sample_news.sql | 3 +-
.../data/mysql/it-IT/necessari/sample_news.sql | 10 +-
installer/data/mysql/kohastructure.sql | 5 +-
.../data/mysql/nb-NO/2-Valgfritt/sample_news.sql | 4 +-
.../data/mysql/pl-PL/optional/sample_news.sql | 4 +-
.../data/mysql/ru-RU/optional/sample_news.sql | 36 ++--
.../data/mysql/uk-UA/optional/sample_news.sql | 34 ++--
installer/data/mysql/updatedatabase.pl | 15 ++
.../prog/en/modules/tools/koha-news.tt | 130 ++++++++++----
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 4 +-
kohaversion.pl | 2 +-
mainpage.pl | 36 ++--
opac/opac-main.pl | 33 ++--
t/NewsChannels.t | 14 --
t/db_dependent/NewsChannels.t | 138 +++++++++++++++
tools/koha-news.pl | 69 ++++++--
22 files changed, 548 insertions(+), 220 deletions(-)
delete mode 100755 t/NewsChannels.t
create mode 100644 t/db_dependent/NewsChannels.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list