Bug 12765 - Capitalization: Cataloguing > Z39.50 search > "Try another search"
Summary: Capitalization: Cataloguing > Z39.50 search > "Try another search"
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: Main
Hardware: All All
: P5 - low trivial (vote)
Assignee: Katrin Fischer
QA Contact: Testopia
URL:
Keywords:
Depends on: 1561
Blocks:
  Show dependency treegraph
 
Reported: 2014-08-15 09:36 UTC by Katrin Fischer
Modified: 2015-06-04 23:33 UTC (History)
5 users (show)

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


Attachments
Bug 12765: Fix capitalization - "Try another search" (2.55 KB, patch)
2014-08-15 09:42 UTC, Katrin Fischer
Details | Diff | Splinter Review
Bug 12765: Fix capitalization - "Try another search" (2.55 KB, patch)
2014-08-28 20:36 UTC, Katrin Fischer
Details | Diff | Splinter Review
Revert "Bug 12176 - Remove HTML from additem.pl" (10.53 KB, patch)
2014-08-28 21:28 UTC, PTFS Europe Sandboxes
Details | Diff | Splinter Review
[SIGNED OFF] Bug 12765: Fix capitalization - "Try another search" (2.62 KB, patch)
2014-08-31 08:56 UTC, Katrin Fischer
Details | Diff | Splinter Review
Bug 12765: Fix capitalization - "Try another search" (1.72 KB, patch)
2014-09-08 09:29 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 Katrin Fischer 2014-08-15 09:36:15 UTC

    
Comment 1 Katrin Fischer 2014-08-15 09:42:34 UTC Comment hidden (obsolete)
Comment 2 Johnny Rotten 2014-08-28 18:16:19 UTC
I couldn't test this patch in the sandboxes.  I tried applying this patch in one of the Biblibre sandboxes last night and in one of the PTFS sandboxes this morning and the sandboxes could not apply the patch to Koha.  

The error message the sandbox e-mailed me in both cases was:

The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 12765:
<h1>Something went wrong !</h1>Applying: Bug 12765: Fix capitalization - Try another search Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 12765: Fix capitalization - Try another search

When you have resolved this problem run git bz apply --continue.
If you would prefer to skip this patch, instead run git bz apply --skip.
To restore the original branch and stop patching run git bz apply --abort.
Bug 12765 - Capitalization: Cataloguing > Z39.50 search > Try another search

30821 - Bug 12765: Fix capitalization - Try another search

Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-12765-Fix-capitalization---Try-another-search-isbnJe.patch .
Comment 3 Katrin Fischer 2014-08-28 20:36:16 UTC Comment hidden (obsolete)
Comment 4 Katrin Fischer 2014-08-28 20:36:47 UTC
I rebased the patch, I think it should work now.
Comment 5 PTFS Europe Sandboxes 2014-08-28 21:28:10 UTC
Patch tested with a sandbox, by George Williams <georgew@latahlibrary.org>
Comment 6 PTFS Europe Sandboxes 2014-08-28 21:28:28 UTC Comment hidden (obsolete)
Comment 7 Marcel de Rooy 2014-08-29 14:02:26 UTC
The current patch seems to be the wrong one.
Please correct.
Comment 8 Katrin Fischer 2014-08-29 14:03:54 UTC
I think the sandbox did something weird here - I will upload a patch with the sign-off line later.
Comment 9 Katrin Fischer 2014-08-31 08:56:27 UTC Comment hidden (obsolete)
Comment 10 Katrin Fischer 2014-08-31 08:56:58 UTC
I have reattached the patch and added the sign off line - thx George!
Comment 11 Jonathan Druart 2014-09-08 09:28:14 UTC
The patch does not apply anymore.
Comment 12 Jonathan Druart 2014-09-08 09:29:36 UTC
Created attachment 31451 [details] [review]
Bug 12765: Fix capitalization - "Try another search"

To test:
- Go to cataloguing
- Perform a z39.50 search with no results
- Check "Try another search" is displayed
- Perform a z39.50 search with results
- Verify display is correct as well.

Signed-off-by: George Williams <georgew@latahlibrary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Comment 13 Jonathan Druart 2014-09-08 09:30:10 UTC
Ok I recreated the patch. Passed QA.
Comment 14 Tomás Cohen Arazi 2014-09-08 13:56:53 UTC
Patch pushed to master.

Thanks Katrin!