|
Description
Mathieu Saby
2013-10-09 19:45:22 UTC
Created attachment 21930 [details] [review] [PATCH] Bug 11030 : add fields 947,969,359 in unimarc_complete french framework This patch must be tested on top of bug 11021 This patch adds 3 fields to unimarc_complete french framework - 359 (2-a-b-c-d-e-f-g-h-i-p-u-v) used by Sudoc network, to be displayed in tab 3 - 947 (c) used by Electre - 969 (a-h) used by Electre I don't know the difference between 969a and 969h so I gave them quite the same name To test : 1) take a fresh Koha with unimarc marcflavor 2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage complètes". 3) check default framework in Administration > MARC Frameworks : it should contains 359/947/969 fields Applying: Bug 11030 : add fields 947,969,359 in unimarc_complete french framework Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11030 : add fields 947,969,359 in unimarc_complete french framework The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Test on sandbox The sandbox you've requested is not ready. Some problems occurred applying patches from bug 11030: <h1>Something went wrong !</h1>Applying: Bug 11030 : add fields 947,969,359 in unimarc_complete french framework fatal: sha1 information is lacking or useless (installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11030 : add fields 947,969,359 in unimarc_complete french framework 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 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework 21930 - [PATCH] Bug 11030 : add fields 947,969,359 in unimarc_complete french framework Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/PATCH-Bug-11030--add-fields-947969359-in-unimarcco-HLgPoP.patch . The patch is clean, but to be applied on top of bug 11021 So, please test fist bug 11021. Both bugs can NOT be tested on a usual sandbox (because you have to check that the "installer" that fills Koha's database is working properly). Mathieu Patch tested and is working fine, i have one remark though: shouldn't the label for field 359 also indicate "(sudoc)" (as was done for 9xx fields), to clarify why it is here? Created attachment 29411 [details] [review] Bug 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework - followup Created attachment 29412 [details] [review] Bug 11030 : add fields 947,969,359 in unimarc_complete french framework This patch must be tested on top of bug 11021 This patch adds 3 fields to unimarc_complete french framework - 359 (2-a-b-c-d-e-f-g-h-i-p-u-v) used by Sudoc network, to be displayed in tab 3 - 947 (c) used by Electre - 969 (a-h) used by Electre I don't know the difference between 969a and 969h so I gave them quite the same name To test : 1) take a fresh Koha with unimarc marcflavor 2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage complètes". 3) check default framework in Administration > MARC Frameworks : it should contains 359/947/969 fields Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com> Created attachment 29413 [details] [review] Bug 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework - followup Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com> I submitted a followup and marked as signed off as my first test was ok and i only wanted to add a very minor change in wording. Created attachment 29524 [details] [review] [PASSED QA] Bug 11030 : add fields 947,969,359 in unimarc_complete french framework This patch must be tested on top of bug 11021 This patch adds 3 fields to unimarc_complete french framework - 359 (2-a-b-c-d-e-f-g-h-i-p-u-v) used by Sudoc network, to be displayed in tab 3 - 947 (c) used by Electre - 969 (a-h) used by Electre I don't know the difference between 969a and 969h so I gave them quite the same name To test : 1) take a fresh Koha with unimarc marcflavor 2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage complètes". 3) check default framework in Administration > MARC Frameworks : it should contains 359/947/969 fields Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Created attachment 29525 [details] [review] [PASSED QA] Bug 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework - followup Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Patches pushed to master. Thanks Mathieu! Pushed to 3.16.x for inclusion in 3.16.2. |