Summary: | Robust handling of deleted biblios/authorities | ||
---|---|---|---|
Product: | Koha | Reporter: | Tomás Cohen Arazi (tcohen) <tomascohen> |
Component: | Architecture, internals, and plumbing | Assignee: | Tomás Cohen Arazi (tcohen) <tomascohen> |
Status: | CLOSED FIXED | QA Contact: | Bugs List <koha-bugs> |
Severity: | normal | ||
Priority: | PATCH-Sent (DO NOT USE) | CC: | chris, nengard |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
See Also: |
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2318 http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2283 |
||
Change sponsored?: | Sponsored | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Attachments: |
Initial patch
(1/2) follow-up - owen suggestions for text (2/2) Error handling for ISBDdetail, MARCdetail and labeledMARCdetail Consolidated, refactored patch Signed off: Consolidated, refactored patch [3.2.x] Consolidated, refactored patch [origin|tt] |
Description
Tomás Cohen Arazi (tcohen)
2011-02-22 13:07:45 UTC
I was pointed in the IRC that 404 error vs. error message is an open issue, as of bug #2318. I attach my proposed patch, and wait for a discussion on this topic in koha devel. I've already sent an email on this. Created attachment 3194 [details] [review] Initial patch This bug is mentioned in: [Bug 5791] Robust handling of deleted biblios/authorities http://lists.koha-community.org/pipermail/koha-patches/2011-February/013913.html I suggest the term "biblio" be replaced with "record" in catalogue/detail.tmpl, and "authority" be "authority record" in authorities/detail.tmpl. Other pages also need work in order for this bug to be completely fixed: catalogue/ISBDdetail.tmpl, catalogue/MARCdetail, and catalogue/labeledMARCdetail.pl Created attachment 3272 [details] [review] (1/2) follow-up - owen suggestions for text Created attachment 3273 [details] [review] (2/2) Error handling for ISBDdetail, MARCdetail and labeledMARCdetail This bug is mentioned in: [Bug 5791] Robust handling of deleted biblios/authorities http://lists.koha-community.org/pipermail/koha-patches/2011-March/014012.html [Bug 5791] Robust handling of deleted biblios/authorities http://lists.koha-community.org/pipermail/koha-patches/2011-March/014014.html [Bug 5791] (2/2) Error handling for ISBDdetail, MARCdetail and labeledMARCdetail http://lists.koha-community.org/pipermail/koha-patches/2011-March/014013.html I have some merge conflicts while applying the first 'Initial patch': Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Robust handling of deleted biblios/authorities Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging authorities/detail.pl CONFLICT (content): Merge conflict in authorities/detail.pl Auto-merging catalogue/detail.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl Failed to merge in the changes. Patch failed at 0001 Robust handling of deleted biblios/authorities When you have resolved this problem run "git am -i -3 --resolved". If you would prefer to skip this patch, instead run "git am -i -3 --skip". To restore the original branch and stop patching run "git am -i -3 --abort". [katrin@wombat kohaclone (oth_5791_nice_error|AM)]$git status Katrin, I'll be on office in about an hour and will rearrange things for the patch to apply. Created attachment 3844 [details] [review] Consolidated, refactored patch I checked out the html_template_pro tag for testing this with the old templates. I tested in intranet: Different biblionumbers and different views of biblio records: http://localhost:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=1000000 http://localhost:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=500000 http://localhost:8080/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=500000 http://localhost:8080/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=500000 Authorities: http://localhost:8080/cgi-bin/koha/authorities/detail.pl?authid=10414999 Created attachment 3905 [details] [review] Signed off: Consolidated, refactored patch [3.2.x] Patches are only valid for 3.2, until they are reworked for Template::Toolkit Created attachment 3938 [details] [review] Consolidated, refactored patch [origin|tt] Patch reworked for template::toolkit templates. Chris N.: Note that patches for 3.2.x are already signed-off, but they where built against pre-tt origin, so they could need to be rebased to apply. Pushed, please test Works great in 3.4 This was included in the 3.4.0 release, marking closed |