This is meant for submitting trivial staff client typo fixes, complementing bug 7367. If they are really trivial, and you tested the fix yourself (of course ;), please add your own signoff. The QA team will most probably not mind.
Created attachment 6867 [details] [review] Signed patch Correct spelling of merge authorities job in pref file. At the same time serving as an example of the above..
Corrects name of script; trivial fix, marking Passed QA
Patch pushed, please test
Attachment 6867 [details] has been pushed to master and stable. Obsoleting the patch and resetting the status to NEW.
Created attachment 8179 [details] [review] Typo in cart_to_shelf Changing usage print statement only.
Corrects cut/paste error in usage. Trivial change, clearly correct, passed QA.
Created attachment 8925 [details] [review] [PATCH] 7368 Followup for indentation in VirtualShelves.pm Corrects some further indentation issues, removes last tab from file. Related to report 7310. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- C4/VirtualShelves.pm | 112 ++++++++++++++++++++++++-------------------------- 1 files changed, 54 insertions(+), 58 deletions(-)
Comment on attachment 8925 [details] [review] [PATCH] 7368 Followup for indentation in VirtualShelves.pm QA comment: this patch is indenting only, passed QA Patch pushed in branch new/bug_7310 (and master, of course)
intranet-tmpl/prog/en/modules/help/tools/letter.tt:154 The transfer sliip is printed when you confirm a transfer from one branch to another in your system (double ii in sliip)
Created attachment 9496 [details] [review] Patch for Card title Changing label for Card to Card in acqui/z3950 search. Goes on top of patch in report 5345
Created attachment 9497 [details] [review] Signed patch Includes self signoff for trivial change
Trivial string change for consistency. Signing off and passing QA.
For an unknown reason, I get a nasty fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 7368 typo: MARC -> Card When you have resolved this problem run "git am --resolved". Can you resubmit ?
Created attachment 9564 [details] [review] Patch Retry..
trivial patch, pushed.
Typo fix but not involving translatable strings, will be in 3.8.1
Created attachment 10191 [details] [review] Patch for history.txt Very trivial fix of whitespace. Restores correct display in about (tabs for spaces).
*** Bug 8237 has been marked as a duplicate of this bug. ***
Passed QA
Comment on attachment 10191 [details] [review] Patch for history.txt this patch pushed
intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt:18 To edit the subfields, click 'Edit Subfields.' ->... Edit Subfields'. intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt:9 When finished, click 'Save.' ->...'Save'. intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt:26 li>Planning categories are used for statistical purposes. To learn more about planning categories, check out the Planning Category FAQ. ->Error with <li>?
(In reply to comment #21) > intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt:18 > To edit the subfields, click 'Edit Subfields.' > ->... Edit Subfields'. > > intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt:9 > When finished, click 'Save.' > ->...'Save'. > > intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt:26 > li>Planning categories are used for statistical purposes. To learn more > about planning categories, check out the Planning Category FAQ. > ->Error with <li>? Marc, Please send a patch for comment9 and the above typos. You can click take over on the assignee, if you do so.
Created attachment 10457 [details] [review] Corrects 2 typos see comment #9
Created attachment 10458 [details] [review] Bug 7368 - General staff client typo omnibus Corrects 2 typos, see comment #9
Attachment 10458 [details]: Passed QA. Very trivial typo fix. Marc: In this kind of case you could have attached your own sign-off. See comment1.
Comment on attachment 10458 [details] [review] Bug 7368 - General staff client typo omnibus This patch has been pushed
all patches pushed, back to assigned
Created attachment 10937 [details] [review] Patch for adding perl dependency Html::FormatText is used in opac-sendbasket.pl and may be part of default Debian. But it is not a default Perl 5.10 module. I had to install it additionally on a test server. So I am adding it to PerlDependencies. Corrected a typo too in comments.
Created attachment 10939 [details] [review] Patch for cataloging HTML::FormatText HTML::FormatText is used in opac-sendbasket.pl and may be part of default Debian. But it is not a default Perl 5.10 module. I had to install it additionally on a test server. So I am adding it to PerlDependencies. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Corrected a typo too in comments.
Forget the latest patch please. I think we should remove this use statement after all; it seems not to be used anyhow..
(In reply to comment #30) > Forget the latest patch please. I think we should remove this use statement > after all; it seems not to be used anyhow.. Well, not that fast. We need it, but somewhere deeper. opac-sendbasket does not need to call [read: use] it. But via Template::Plugin::HtmlToText it is required via the template of sendbasket. So it should be there after all.
Created attachment 10956 [details] [review] Patch for cataloging dependency So, the third time is always the best :)
This patch displays a warning with the following command: perl koha_perl_deps.pl -i koha_perl_deps.pl: Use of uninitialized value in formline at koha_perl_deps.pl line 65, <DATA> line 522. I think it is caused by the missing 'min_ver' information. However, I don't understand what is the value '2' for required. Can you shed some light on this please ?
(In reply to comment #33) > This patch displays a warning with the following command: > perl koha_perl_deps.pl -i > > koha_perl_deps.pl: Use of uninitialized value in formline at > koha_perl_deps.pl line 65, <DATA> line 522. > > I think it is caused by the missing 'min_ver' information. > However, I don't understand what is the value '2' for required. Can you shed > some light on this please ? Good catch. I saw somewhere else that min_ver was not added too, will correct that now also. I tested about page, but should have run this script too. Thanks.
Created attachment 11048 [details] [review] Adjusted patch for perl deps Jonathan: Could you please add a signoff too?
Still wondering about this error: [Fri Jul 20 16:37:07 2012] koha_perl_deps.pl: Use of uninitialized value $version in numeric lt (<) at /usr/local/share/perl5/Modern/Perl.pm line 25. [Fri Jul 20 16:37:07 2012] koha_perl_deps.pl: Use of uninitialized value $version in numeric lt (<) at /usr/local/share/perl5/Modern/Perl.pm line 25. This is separate from the last patch and comes up in current master already. Any idea?
(In reply to comment #35) > Created attachment 11048 [details] [review] > Adjusted patch for perl deps > > Jonathan: Could you please add a signoff too? Probably, usage=> Core could be amended to Unit tests..
*** Bug 8487 has been marked as a duplicate of this bug. ***
Created attachment 11069 [details] [review] [SIGNED-OFF] Adjusted patch for perl deps hum... strange, I have no error on current master. And your last patch fixes my previous problem :-) Then I switch to signed-off
(In reply to comment #39) > Created attachment 11069 [details] [review] > [SIGNED-OFF] Adjusted patch for perl deps > > hum... strange, I have no error on current master. > > And your last patch fixes my previous problem :-) > > Then I switch to signed-off Thanks. What perl version are you using BTW ?
(In reply to comment #40) > Thanks. What perl version are you using BTW ? $ perl -v This is perl 5, version 14, subversion 2 (v5.14.2)
(In reply to comment #41) > (In reply to comment #40) > > Thanks. What perl version are you using BTW ? > $ perl -v > This is perl 5, version 14, subversion 2 (v5.14.2) Hmm. I have the same. If I run on master perl koha-perl-deps -a I have the error referred above.. Looks like some module does not contain a version, but could not find it?
(In reply to comment #42) > Hmm. I have the same. If I run on master perl koha-perl-deps -a > I have the error referred above.. > Looks like some module does not contain a version, but could not find it? Note that the error comes first, before the long listing of module names. You could easily miss it.
It seems it is caused by the version of Modern::Perl: $pmvers Modern::Perl 1.03 My Modern/Perl.pm contains our $VERSION = '1.03'; Whereas a new version of this module contains: Modern::Perl::VERSION { my ($self, $version) = @_; return $VERSION if $version < 2009; $wanted_date = $version if (caller(1))[3] =~ /::BEGIN/; return 2012; } Actually, I don't know how we can fix that.
(In reply to comment #44) > It seems it is caused by the version of Modern::Perl: Good, you found that. Interesting! I have this version: $Modern::Perl::VERSION = '1.20120130' and the same routine. But I still do not understand it completely. It seems like an error in Modern::Perl although its docs state that it is not necessary to pass a version or a year to Modern::Perl. AFAIK we are not passing numbers to Modern::Perl in our Koha use statements. But when I test that in a simple script, I do not even raise this warning. What makes koha_perl_deps do raise that warning? Since this is not very important, I will copy the last comments on this error in a separate report. To be resolved one day :)
(In reply to comment #45) > Since this is not very important, I will copy the last comments on this > error in a separate report. To be resolved one day :) See further bug 8491.
Comment on attachment 11069 [details] [review] [SIGNED-OFF] Adjusted patch for perl deps trivial patch, passed QA and pushed in one go
The latest patch doesn't apply on 3.8.x please resubmit if you think it should be there too.
Created attachment 11189 [details] [review] [3.8.X] 7368 Adjustments for Perl dependencies Fixed conflict for 3.8.X
Changed status to Pushed to master for inclusion of rebased 3.8.x patch.
Pushed to 3.8.x will be in 3.8.4
Created attachment 11760 [details] [review] Patch to fix typo subsribe --> subscribe
Created attachment 11761 [details] [review] [SIGNED-OFF] Bug 7368: fixed subsribe typo Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Corrects typo.
Thanks, Kathryn and Katrin! Passed QA
Comment on attachment 11761 [details] [review] [SIGNED-OFF] Bug 7368: fixed subsribe typo This patch has been pushed
Created attachment 13395 [details] [review] Patch for dependant= occurrences Should be dependent= Note: ignored feature in most browsers! But dependant is ignored everywhere :) Covers: koha-tmpl/intranet-tmpl/prog/en/js/basket.js koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc koha-tmpl/opac-tmpl/ccsr/en/js/basket.js koha-tmpl/opac-tmpl/prog/en/js/basket.js one occurrence already covered by bug 9059 koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
(In reply to comment #56) > Note: ignored feature in most browsers! But dependant is ignored everywhere Ignored by most browsers? Is it followed by *any* browsers? I suggest we remove rather than correct references to it.
(In reply to comment #57) > Ignored by most browsers? Is it followed by *any* browsers? I suggest we > remove rather than correct references to it. Removing them in adjusted patch. Could you sign off? Thx.
Created attachment 13443 [details] [review] Patch for dependant Adjusted patch removing dependant=
Created attachment 13446 [details] [review] [SIGNED-OFF] 7368 Removing occurrences of dependant= feature in javascript open calls The window feature dependant= should have been written as dependent= Note that this feature is ignored in most/current browsers. Since the feature was misspelled, removing it will not change any behavior or hurt anybody. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
QA comment: * small patch, cleaning code. * no change in strings passed QA
This patch has been pushed to master.
Patch pushed to branch 3.10.x
Created attachment 13971 [details] [review] Patch for GetXmlBiblio documentation Only changing some documentation about GetXmlBiblio in Biblio.pm, ImportBatch.pm and export.pl. IMO further references to GetXmlBiblio (from grepping) were not interesting enough to include.
Hey Marcel, I think you have missed the word 'contain' somewhere here? "The XML should only biblio information" I am hesitating to bloat this with a followup, maybe you would like to just update your patch?
(In reply to comment #65) > Hey Marcel, > > I think you have missed the word 'contain' somewhere here? > "The XML should only biblio information" > > I am hesitating to bloat this with a followup, maybe you would like to just > update your patch? Hi Mirko, If you signoff, I do not mind that you amend the commit for such things. Thx.
Created attachment 14114 [details] [review] 7368 GetXmlBiblio Only changing some documentation about GetXmlBiblio Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Created attachment 14115 [details] [review] 7368 GetXmlBiblio Only changing some documentation about GetXmlBiblio Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Added the word 'contain'
QA Comments: Last patch changes some lines of documentation. Marked as Passed QA.
Created attachment 14263 [details] [review] 7368 GetXmlBiblio Only changing some documentation about GetXmlBiblio Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Added the word 'contain' Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Pushed to master and 3.10.x
Created attachment 16095 [details] [review] Bug 7368: POD doc in VirtualShelves.pm Only moving/adding some documentation in VirtualShelves.pm. Related to earlier changes in connection with report 7310. Adding my own signoff, nothing to test here. Does Koha still work? :) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
QA comment for http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16095 : trivial patch, koha-qa OK, passed QA
Created attachment 17182 [details] [review] Bug 7368: Typo in kohastructure.sql documentation line Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 17183 [details] [review] Bug 7368: Typo in kohastructure.sql documentation line Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Created attachment 17452 [details] [review] 7368 Typo in edithelp.pl warning Typo: able save => able to save. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch has been pushed to master and 3.12.x.
Created attachment 17785 [details] [review] Bug 7368: Small typo in history.txt beomes becomes becomes :) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 17817 [details] [review] [PASSED QA] Bug 7368: Small typo in history.txt beomes becomes becomes :) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Fixes a typo in a text file, no problems found.
Created attachment 18400 [details] [review] 3 typos in history.txt fixed 3 more typos fixed.
Created attachment 18401 [details] [review] Bug 7368: Correct three typos in history.txt Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Created attachment 18407 [details] [review] Bug 7368: Correct three typos in history.txt Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Latest pushed to master. Thanks, Connor!
Last patch has been pushed to 3.12.x, will be in 3.12.1.
Pushed to 3.10.x, will be in 3.10.7
Pushed to 3.8.x, will be in 3.8.14
Created attachment 19206 [details] [review] Bug 7368: Followup for columns names in userflags.sql An insert statement should contain the column names to avoid confusion and future problems with table definition changes. I have updated the English default file. Will send updates for the other languages in connection with replacing inserts by updates for the additional languages (where possible). For userflags this will be the case. Test plan: Do an install (English). Or run this file from command line. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 19208 [details] [review] Bug 7368: Followup for columns names in userflags.sql An insert statement should contain the column names to avoid confusion and future problems with table definition changes. I have updated the English default file. Will send updates for the other languages in connection with replacing inserts by updates for the additional languages (where possible). For userflags this will be possible. Test plan: Do an install (English). Or -- as a dangerous(!) alternative--: Do this ONLY on a restorable database. Delete all records in userflags. (Note: This cascades to permissions a.o.) Run this file from command line. Check if you have records again in userflags. (You also messed up your Koha.) Restore your database. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested both ways myself :)
Created attachment 19230 [details] [review] SIGNED-OFF-Bug-7368-Followup-for-columns-names-in-us Manual upload, git bz is playing tricks with me.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Work as described. No errors. Tested using second alternative Just a note: if you update other lang files replacing INSERTs for UPDATEs then you must install using EN and later apply lang files by hand. If you do a translate first before webinstaller, and finish your install in your lang, then that kind of file will fail.
Thanks, Bernardo. > Just a note: if you update other lang files replacing INSERTs for UPDATEs > then you must install using EN and later apply lang files by hand. > If you do a translate first before webinstaller, and finish your install > in your lang, then that kind of file will fail. No, I am not suggesting a manual procedure. It will be done automatically in the web installer. Will open a new report for it soon. (I started a discussion about this on dev list recently..)
Created attachment 19258 [details] [review] Bug 7368: Followup for columns names in userflags.sql An insert statement should contain the column names to avoid confusion and future problems with table definition changes. I have updated the English default file. Will send updates for the other languages in connection with replacing inserts by updates for the additional languages (where possible). For userflags this will be possible. Test plan: Do an install (English). Or -- as a dangerous(!) alternative--: Do this ONLY on a restorable database. Delete all records in userflags. (Note: This cascades to permissions a.o.) Run this file from command line. Check if you have records again in userflags. (You also messed up your Koha.) Restore your database. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Tested both ways myself :) Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Work as described. No errors. Tested using second alternative Just a note: if you update other lang files replacing INSERTs for UPDATEs then you must install using EN and later apply lang files by hand. If you do a translate first before webinstaller, and finish your install in your lang, then that kind of file will fail. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> mysql> create database test; Query OK, 1 row affected (0.00 sec) % mysql -u koha -p test < installer/data/mysql/kohastructure.sql % mysql -u koha -p test < installer/data/mysql/en/mandatory/userflags.sql mysql> select count(*) from userflags; +----------+ | count(*) | +----------+ | 19 | +----------+ 1 row in set (0.00 sec)
Comment on attachment 19258 [details] [review] Bug 7368: Followup for columns names in userflags.sql Pushed latest to master. Thanks, Marcel!