Bug 10330 - Rename system preference authoritysep to AuthoritySeparator
Summary: Rename system preference authoritysep to AuthoritySeparator
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Architecture, internals, and plumbing (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Kyle M Hall
QA Contact:
URL:
Keywords:
Depends on:
Blocks: 10327
  Show dependency treegraph
 
Reported: 2013-05-24 11:51 UTC by Kyle M Hall
Modified: 2015-06-04 23:33 UTC (History)
5 users (show)

See Also:
Change sponsored?: ---
Patch complexity: Trivial patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
Bug 10330 - Rename system preference authoritysep to AuthoritySeperator (8.26 KB, patch)
2013-05-24 11:56 UTC, Kyle M Hall
Details | Diff | Splinter Review
Bug 10330 - Rename system preference authoritysep to AuthoritySeperator (7.78 KB, patch)
2014-04-10 04:11 UTC, Mark Tompsett
Details | Diff | Splinter Review
Bug 10330 - Follow up - missed case of authoritysep (1.07 KB, patch)
2014-04-10 04:16 UTC, Mark Tompsett
Details | Diff | Splinter Review
[SIGNED-OFF] Bug 10330 - Rename system preference authoritysep to AuthoritySeperator (7.88 KB, patch)
2014-05-01 23:32 UTC, Bernardo Gonzalez Kriegel
Details | Diff | Splinter Review
[SIGNED-OFF] Bug 10330 - Follow up - missed case of authoritysep (1.14 KB, patch)
2014-05-01 23:32 UTC, Bernardo Gonzalez Kriegel
Details | Diff | Splinter Review
Bug 10330 - Rename system preference authoritysep to AuthoritySeperator (7.98 KB, patch)
2014-05-08 16:17 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 10330 - Follow up - missed case of authoritysep (1.18 KB, patch)
2014-05-08 16:17 UTC, Jonathan Druart
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Kyle M Hall 2013-05-24 11:51:05 UTC

    
Comment 1 Kyle M Hall 2013-05-24 11:56:04 UTC Comment hidden (obsolete)
Comment 2 David Cook 2013-06-11 04:22:11 UTC
Maybe there's something wrong with my files, but I think you need a rebase.

Applying: Bug 10330 - Rename system preference authoritysep to AuthoritySeperator
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 10330 - Rename system preference authoritysep to AuthoritySeperator
Comment 3 Mark Tompsett 2014-04-10 04:11:48 UTC Comment hidden (obsolete)
Comment 4 Mark Tompsett 2014-04-10 04:16:29 UTC Comment hidden (obsolete)
Comment 5 Bernardo Gonzalez Kriegel 2014-04-15 00:35:32 UTC
(In reply to M. Tompsett from comment #3)
> Created attachment 26941 [details] [review] [review]
> Bug 10330 - Rename system preference authoritysep to AuthoritySeperator
> 
> Test Plan:
> 1) Apply patch
> 2) Run updatedatabase.pl
> 3) View some records with authorities
> 4) Note your previously set authority separator should still be in use

Mark, this first one is signed? 
Or, Are you considering to sign it?
Comment 6 Mark Tompsett 2014-04-15 04:00:55 UTC
I signed off the first one. The second (Follow up...) I wrote. It is NOT signed off.
Comment 7 Mark Tompsett 2014-04-15 04:17:40 UTC
Hmmm... on second thought, just consider nothing signed. I may have just rebased, since I don't have a 10330 branch in my unimarc vm. I have been trying to save things from the patch does not apply pile.
Comment 8 Bernardo Gonzalez Kriegel 2014-05-01 23:32:19 UTC Comment hidden (obsolete)
Comment 9 Bernardo Gonzalez Kriegel 2014-05-01 23:32:27 UTC Comment hidden (obsolete)
Comment 10 Jonathan Druart 2014-05-08 16:17:13 UTC
Created attachment 28118 [details] [review]
Bug 10330 - Rename system preference authoritysep to AuthoritySeperator

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) View some records with authorities
4) Note your previously set authority separator should still be in use

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Comment 11 Jonathan Druart 2014-05-08 16:17:18 UTC
Created attachment 28119 [details] [review]
Bug 10330 - Follow up - missed case of authoritysep

$ git grep authoritysep
This showed:
1) the updatedatabase.pl script, as expected,
2) lots of po files,
3) a test file that was missed.

TEST PLAN
---------
1) prove -v t/db_dependent/Search.t
2) Run koha QA test tools

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work (both patches). Test pass. No koha-qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Comment 12 Galen Charlton 2014-05-23 13:30:58 UTC
Pushed to master.  Thanks, Kyle!