Attachment 22552 Details for Bug 7180 – Bug 7180: Change syspref description

[patch] Bug 7180: Change syspref description

Bug-7180-Change-syspref-description.patch (text/plain), 2.20 KB, created by Jonathan Druart on 2013-10-30 08:45:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-10-30 08:45:33 UTC

Size: 2.20 KB

patch

obsolete

>From 224851f60a0309bd245cb344a87f72ae7d808024 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Tue, 10 Sep 2013 10:30:25 +0200
>Subject: [PATCH] Bug 7180: Change syspref description
>
>- the blank line is now useless
>- add an example for the syspref value
>---
> acqui/addorderiso2709.pl                                      |    9 ++++++++-
> .../prog/en/modules/admin/preferences/acquisitions.pref       |    4 ++--
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
>index e25df0d..78e8fd5 100755
>--- a/acqui/addorderiso2709.pl
>+++ b/acqui/addorderiso2709.pl
>@@ -492,7 +492,14 @@ sub add_matcher_list {
> sub get_infos_syspref {
>     my ($record, $field_list) = @_;
>     my $syspref = C4::Context->preference('MarcFieldsToOrder');
>-    my $yaml = YAML::Load($syspref);
>+    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
>+    my $yaml = eval {
>+        YAML::Load($syspref);
>+    };
>+    if ( $@ ) {
>+        warn "Unable to parse MarcFieldsToOrder syspref : $@";
>+        return ();
>+    }
>     my $r;
>     for my $field_name ( @$field_list ) {
>         my @fields = split /\|/, $yaml->{$field_name};
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>index 4c9dc46..7cec442 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>@@ -43,10 +43,10 @@ Acquisitions:
>                   no: "Do not warn"
>             - when the librarian tries to create an invoice with a duplicate number.
>         -
>-            - Set the mapping values for a new order line created from a marcrecord (staged file). In a YAML format, so you have to finished with an empty line.
>+            - Set the mapping values for a new order line created from a marcrecord (staged file).
>             - pref: MarcFieldsToOrder
>               type: textarea
>-
>+            - "For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a<rb/>"
>     Printing:
>         -
>             - Use
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 7180: 6234 | 13019 | 15023 | 15048 | 15617 | 15677 | 15934 | 15935 | 16014 | 16505 | 16511 | 16544 | 16566 | 16613 | 19066 | 19067 | 19068 | 19316 | 19587 | 19588 | 19589 | 19590 | 19641 | 19645 | 20900 | 20901 | 20902 | 20903 | 20904 | 20926 | 20933 | 20934 | 20935 | 20978 | 20979 | 21004 | 21014 | 21017 | 21117 | 21462 | 21463 | 21464 | 21465 | 21466 | 21467 | 21468 | 21469 | 21470 | 21471 | 21472 | 21473 | 21474 | 21514 | 22546 | 22547 | 22548 | 22549 | 22550 | 22551 | 22552 | 22553 | 22554 | 22555 | 22556 | 22557 | 22558 | 22559 | 24052 | 24053 | 24054 | 24055 | 24056 | 24057 | 24058 | 24059 | 24060 | 24061 | 24062 | 24063 | 24064 | 24065 | 24636 | 24637 | 24638 | 24639 | 24640 | 24641 | 24642 | 24643 | 24644 | 24645 | 24646 | 24647 | 24648 | 24649 | 24708 | 24709 | 24710 | 24711 | 24712 | 24713 | 24714 | 24715 | 24716 | 24717 | 24718 | 24719 | 24720 | 24721 | 25908 | 26950 | 26951 | 26952 | 26953 | 26954 | 26955 | 26956 | 26957 | 26958 | 26959 | 26960 | 26961 | 26962 | 26963 | 26964 | 27128 | 27131 | 27136 | 27160 | 27325 | 27408 | 27409 | 27410 | 27411 | 27412 | 27413 | 27414 | 27415 | 27416 | 27417 | 27418 | 27419 | 27420 | 27421 | 27422 | 27423 | 27424 | 27451 | 27520 | 27561 | 27562 | 27563 | 27564 | 27565 | 27566 | 27567 | 27568 | 27569 | 27570 | 27571 | 27572 | 27573 | 27574 | 27575 | 27576 | 27577 | 27578 | 27829 | 27830 | 27831 | 27832 | 27833 | 27834 | 27835 | 27836 | 27837 | 27838 | 27839 | 27840 | 27841 | 27842 | 27843 | 27844 | 27845 | 27846 | 27847 | 27848 | 27849 | 27850 | 27851 | 27852 | 27853 | 27854 | 27855 | 27856 | 27857 | 27858 | 27859 | 27860 | 27861 | 27862 | 27863 | 27864 | 27865 | 27866