[koha-commits] main Koha release repository branch master updated. v3.20.00-243-gbf9bff8
Git repo owner
gitmaster at git.koha-community.org
Wed Jun 24 16:30:37 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 bf9bff898f583c90714e9dc98e28bffd8cc24b2b (commit)
via f900ea03bf15746bd2c310b59f2fb06972f6bdee (commit)
via cbf3c9aa40c13f15a704945f7d6ceaf3aab4b3f0 (commit)
via cb44a8de3a6fbe7ecf2d349a6cab44ace0dc7165 (commit)
via d27af7a3c5ac95ad12fe99436d71336adbba9fad (commit)
via 7e449548e8646dfd70f53119096b70a3dbd8477e (commit)
via 3a179e7a2bbf09b887518e90a4d1e324bfc2e6b3 (commit)
via c446a4da4e709ba1f848092fa06f6d21fff157eb (commit)
via abbd51fb004b853ea7cd0cd86dbccbbd9ffb706d (commit)
via 8da9d099c6a3455edd3c0aee2253b68050d3c596 (commit)
via a2478a708ba72893d435365a5f00025e709d495f (commit)
via 36e68aaaa989b913d0007740b6fa2162b223ace5 (commit)
via 2845fb2423a24b2adde52a421f7a9e5d99bc36f7 (commit)
from cad134cd172c50dd55bf11696d69460bc2bf547d (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 bf9bff898f583c90714e9dc98e28bffd8cc24b2b
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Tue Feb 24 15:50:49 2015 +0100
Bug 12074: Filter duplicates when adding a batch from a staged file
When adding a batch of records to a basket, duplicates are skipped and
an alert is displayed with a link to them so as they could be treated
individually.
Test plan :
You need the 2 test attached files TestFile1.mrc and TestFile2.elc
(TestFile1 includes only the title "Amilec ou La graine d'hommes" that
is also included in TestFile2)
1) go to “Stage MARC records for import” page, upload TestFile1 and
stage it (select iso 5426 encoding).
2) Manage staged record and import the batch.
3) Make sure that the new record is indexed (depending to your indexing
system and test platform).
4) Go back to go to “Stage MARC records for import” page upload
TestFile2 and stage it (select iso 5426 encoding).
5) Go to acquisitions module and create a new basket.
6) From your basket, in the “Add order to basket block” choose 'From a
staged file'.
7) Then click File2 (‘addorder button').
8) Go down the "Import all" block and save.
9) You are redirected to the basket page : a warning is displayed to
tell you that some duplicates have been found and skipped.
There's a link on the warning throughout you can go back to the list of
remaining records and treat them individually if necesary.
10) Click the link : you fall upon the title of TestFile1 (of course as
it's a duplicate).
11) Check that the imported records have been indexed.
11) Go down the "Import all" block and save.
12) A warning is displayed saying that no records have been imported
because they all match an existing record. The “Import all” block is not
any more visible.
Signed-off-by: JA <aloi54 at live.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f900ea03bf15746bd2c310b59f2fb06972f6bdee
Author: Liz <wizzyrea at gmail.com>
Date: Wed Jun 24 09:52:05 2015 +0000
Bug 14450: itemsearch no longer working
To test:
Click Advanced search in staff client
Click the link for "Go to Item Search" at the top of the page
Do a search, you should get results. Try some combinations and make sure it works like it should.
Signed-off-by: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cbf3c9aa40c13f15a704945f7d6ceaf3aab4b3f0
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Tue Jun 23 16:10:22 2015 +0200
Bug 14439: Add test - template path should finish by .tt
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cb44a8de3a6fbe7ecf2d349a6cab44ace0dc7165
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jun 23 15:50:39 2015 +0200
Bug 14439: Typo in Bug 14408 regexp
In Bug 14408 first patch, the regexp used needs an escape on dot and does not need an ending "?"
Test plan :
- prove t/db_dependent/Auth.t
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d27af7a3c5ac95ad12fe99436d71336adbba9fad
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jun 24 10:34:51 2015 -0300
Bug 14252: DBRev 3.21.00.011
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7e449548e8646dfd70f53119096b70a3dbd8477e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Thu Jun 4 16:02:19 2015 +0200
Bug 14252: Add sort by rfc4646_subtag in footer
This patch sort by rfc4646_subtag the languages in the footer.
Same as in the header.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3a179e7a2bbf09b887518e90a4d1e324bfc2e6b3
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Mon Jun 1 19:22:29 2015 +0530
Bug 14252: (followup) addresses the QA Manager comments
Addresses Katrin's comments in comment# 56
TEST PLAN
---------
1) Back up your DB
2) Ensure you have multiple languages, including
some that have sub-languages (e.g. de-DE, de-CH)
-- cd misc/translator
-- perl translate install {language code}
3) Ensure that you have all the languages enabled
-- Staff client -> Home -> Global system preferences
--> I18N/L10N
Check all the languages in opaclanguages.
Ensure that opaclanguagesdisplay is 'Allow'
4) Open OPAC
-- should only have languages in footer.
Annoyingly below the fold.
5) Drop your koha database, and create a blank one.
6) Apply all patches
7) Reinstall all the known languages, so the templates
are appropriately updated.
8) Go to staff client and do an install of koha, with
all the dummy data.
9) Ensure you have all the languages enabled (see (3))
10) Refresh your OPAC page
-- language selector position should be in both
the footer and at the top as expected.
-- this confirms the sysprefs.sql change.
11) Restore your DB
12) run the updatedatabase.pl script
13) Ensure you have all the languages enabled (see (3))
14) Refresh the OPAC page
-- should still only have languages in the footer.
-- this confirms that upgrade won't change anything.
-- this confirms the atomic update.
15) git diff origin/master
-- the opac-bottom.inc difference should only
have changes around a SET, IF, and END.
This confirms the noprint was fixed.
16) In the staff client, change the OPAC system preference,
OpacLangSelectorMode, to all three values.
For each value, refresh the OPAC page, and confirm the
position of the language selector.
-- should work as expected.
17) run koha qa test tools
NOTE: Tested as a single batch together.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c446a4da4e709ba1f848092fa06f6d21fff157eb
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sun May 31 23:16:17 2015 -0400
Bug 14252: Follow up noprint and default values
TEST PLAN
---------
0) Back up your DB
1) open OPAC
-- should only have languages in footer.
Annoyingly below the fold.
2) Drop your koha database, and create a blank one.
3) Apply all patches
4) Go to staff client and do an install of koha, with
all the dummy data.
5) Once installed, refresh your OPAC page
-- language selector position should be in footer
still as expected.
-- this confirms the sysprefs.sql change.
6) Restore your DB
7) run the updatedatabase.pl script
8) Refresh the OPAC page
-- should still only have languages in the footer.
-- this confirms that upgrade won't change anything.
-- this confirms the atomic update.
9) git diff origin/master
-- the opac-bottom.inc difference should only
have changes around a SET, IF, and END.
This confirms the noprint was fixed.
10) In the staff client, change the OPAC system preference,
OpacLangSelectorMode, to all three values.
For each value, refresh the OPAC page, and confirm the
position of the language selector.
-- should work as expected.
11) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit abbd51fb004b853ea7cd0cd86dbccbbd9ffb706d
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Mon Jun 1 05:46:30 2015 +0530
Bug 14252: (fix) address the indentation for the lang loop
tidy the indentation for that lang selector loop code.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8da9d099c6a3455edd3c0aee2253b68050d3c596
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Mon Jun 1 05:26:31 2015 +0530
Bug 14252: (Followup) Fixed issues pointed to in comment #40
Based on Mark's inputs in comment #40 -
[1] selected 'mast' (short of 'masthead') and updated :
(a) bug_14252-OpacLangSelectorMode_syspref.sql
(b) sysprefs.sql
(c) opac.pref
[2] Reduced the calls to Koha.Preference() from :
(a) masthead.inc
(b) opac-bottom.inc
After applying this patch, update the database once for it to pick
up the new option values -'both|mast|foot'.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a2478a708ba72893d435365a5f00025e709d495f
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Thu May 28 04:18:44 2015 +0530
Bug 14252: (followup) Adds OpacLangSelectorMode syspref
Based on discussion, this followup does the following:
1/ brings back the switcher on opac-bottom.inc
2/ adds a syspref OpacLangSelectorMode to toggle between the three
modes:
(a) show switcher both on masthead and footer (default)
(b) footer only
(b) masthead only
Test plan
=========
1/ apply earlier patches attached to this bug in their correct order
2/ apply this followup patch
3/ run updatedatabase.pl to add in the atomic update
4/ goto admin/preferences.pl?tab=opac
5/ look up OpacLangSelectorMode, it should be set with default value
"both masthead and footer"
6/ check OPAC to see if both locations show the selectors
7/ change OpacLangSelectorMode to 'only header' and 'only footer' at
each iteration, and check if the selection has correctly toggled
the selectors. It should
Note: make sure you do not have the patch 11057 applied on the branch
from before, otherwise merge conflict might happen.
http://bugs.koha-community.org/show_bug.cgi?id=14252
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 36e68aaaa989b913d0007740b6fa2162b223ace5
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sat May 23 14:40:52 2015 -0300
Bug 14252: (followup) fix lang chooser for sublanguages
This quick fix disables sublanguages dropdown,
show all sublanguages on same level.
To test:
1) Apply both patches
2) Translate to have sublanguages (en-NZ, de-DE, de-CH)
3) Go to opac, confirm you can select any lang/sublang
4) Check on movil device
4th version.
Removed rfc4646 subtag on sublanguages, think it's cleaner.
Currently on master all translated languages/regions have
valid description ('en' at least)
Added language sort using rfc4646 subtag
Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
Followup fixes the issue with lang group dropdowns. Works well
across standard desktop as well as mobile device with small screens
(checked on 4.3" / 4.7" / 5")
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 2845fb2423a24b2adde52a421f7a9e5d99bc36f7
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Sat May 23 03:11:48 2015 +0530
Bug 14252: Move OPAC lang switcher to masthead navbar
The OPAC language switcher takes up a lot of space at the bottom of the
browser. It also has issues of being not always visible.
This patch adds the switcher to the masthead navbar and removes from the
opac-bottom.inc navbar.
Test plan
=========
1/ Apply patch
2/ Set opaclanguagesdisplay syspref to 'show'.
3/ Add a few languages i.e. es-ES, fr-FR and de-DE
$ cd misc/translator
$ perl translate <langcode>
4/ Enable installed languages for OPAC use by checking on 'opaclanguages'
under I18N/L10N sysprefs
5/ Go to the OPAC, you should have a "Languages" dropdown on the masthead
navbar, the opac-bottom.inc navbar should no longer be there.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works, no koha-qa errors.
Followup fix language chooser for sublanguages
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 2 +-
Koha.pm | 2 +-
acqui/addorderiso2709.pl | 12 ++++++-
acqui/basket.pl | 2 ++
catalogue/itemsearch.pl | 4 +--
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 10 ++++++
.../prog/en/modules/acqui/addorderiso2709.tt | 6 ++++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +++
.../prog/en/modules/admin/preferences/opac.pref | 7 ++++
.../{itemsearch.csv.tt => itemsearch_csv.tt} | 0
.../{itemsearch.json.tt => itemsearch_json.tt} | 0
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 37 ++++++++++++++++++++
.../bootstrap/en/includes/opac-bottom.inc | 6 ++--
t/db_dependent/Auth.t | 3 +-
15 files changed, 88 insertions(+), 8 deletions(-)
rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.csv.tt => itemsearch_csv.tt} (100%)
rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.json.tt => itemsearch_json.tt} (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list