[Koha-docs] OPAC Self Registration improvement

[Nicole Engard]

Same error - I wonder if you could attach a patch file instead of sending
it as part of the email text:



Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: OPAC Self Registration improvement
Using index info to reconstruct a base tree...
M    en/manual.xml
error: patch failed: en/manual.xml:38189
error: en/manual.xml: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 OPAC Self Registration improvement
The copy of the patch that failed is found in:
   /Users/nengard/manual/.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".
Nicole-Pro:manual nengard$

On Thu, Jan 8, 2015 at 3:23 AM, Nicolas Legrand <nicolas.legrand at bulac.fr>
wrote:

> ho sorry (and sorry in my turn for being late...). Is this better?
>
> $ git format-patch
> bd71ccca3667ad88531d0dad076dfc7b211f59de..b3ff68f1ed43e48a4f8a87d2dce3b75604777168
> --stdout
> From b3ff68f1ed43e48a4f8a87d2dce3b75604777168 Mon Sep 17 00:00:00 2001
> From: Nicolas Legrand <nicolas.legrand at bulac.fr>
> Date: Mon, 8 Dec 2014 16:49:10 +0100
> Subject: [PATCH] OPAC Self Registration improvement
>
> Make it consistant with the template logic:
>
>     [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory
> %]...
>                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> Had been fighting a bit not understanding why the message didn't show,
> while having only allowed PatronSelfRegistration.
> ---
>  en/manual.xml |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/en/manual.xml b/en/manual.xml
> index 51fc2c2..83650f9 100644
> --- a/en/manual.xml
> +++ b/en/manual.xml
> @@ -38189,8 +38189,9 @@ location: [STAFF, ISO]</programlisting>Will block
> items with an ity
>        <title>OPAC Self Registration</title>
>        <para>If you allow it, patrons can register for their own accounts
> via the OPAC.  If
>          the <link
> linkend="PatronSelfRegistration">PatronSelfRegistration</link> preferenc
> -        'Allow' then patrons will see a link to register below the log in
> box on the right
> -        main OPAC page.</para>
> +        'Allow' and the <link
> linkend="PatronSelfRegistrationDefaultCategory">
> +        PatronSelfRegistrationDefaultCategory</link> set, then patrons
> will see a link to
> +        below the log in box on the right of the main OPAC page.</para>
>        <screenshot>
>            <screeninfo>Registration link in OPAC</screeninfo>
>            <mediaobject>
> --
> 1.7.10.4
>
> Cheers,
>
> 2014-12-19 18:06 GMT+01:00 Nicole Engard <nengard at gmail.com>:
>
>> Sorry for the delay here, but this patch doesn't apply:
>>
>> Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
>> Applying: OPAC Self Registration improvement
>> fatal: corrupt patch at line 6
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 OPAC Self Registration improvement
>> The copy of the patch that failed is found in:
>>    /Users/nengard/manual/.git/rebase-apply/patch
>>
>> On Mon, Dec 8, 2014 at 10:01 AM, Nicolas Legrand
>> <nicolas.legrand at bulac.fr> wrote:
>> > Hello,
>> >
>> > I propose to make it consistant with the template logic:
>> >
>> >     [% IF PatronSelfRegistration &&
>> PatronSelfRegistrationDefaultCategory %]...
>> >
>> > Had been fighting a bit not understanding why the message didn't show,
>> > while having only allowed PatronSelfRegistration.
>> >
>> > Here is the diff:
>> >
>> > diff --git a/en/manual.xml b/en/manual.xml
>> > index 51fc2c2..83650f9 100644
>> > --- a/en/manual.xml
>> > +++ b/en/manual.xml
>> > @@ -38189,8 +38189,9 @@ location: [STAFF, ISO]</programlisting>Will
>> > block items with an itype code of
>> >        <title>OPAC Self Registration</title>
>> >        <para>If you allow it, patrons can register for their own
>> > accounts via the OPAC.  If you have
>> >          the <link
>> > linkend="PatronSelfRegistration">PatronSelfRegistration</link>
>> > preference set to
>> > -        'Allow' then patrons will see a link to register below the
>> > log in box on the right of the
>> > -        main OPAC page.</para>
>> > +        'Allow' and the <link
>> linkend="PatronSelfRegistrationDefaultCategory">
>> > +        PatronSelfRegistrationDefaultCategory</link> set, then
>> > patrons will see a link to register
>> > +        below the log in box on the right of the main OPAC page.</para>
>> >        <screenshot>
>> >            <screeninfo>Registration link in OPAC</screeninfo>
>> >            <mediaobject>
>> >
>> > Cheers,
>> >
>> > --
>> >
>> > Nicolas Legrand
>> > Administration technique et développements du système de gestion de la
>> > bibliothèque
>> >
>> >
>> > Bibliothèque universitaire
>> > des langues et civilisations
>> >
>> > 65 rue des Grands Moulins
>> > F-75013 PARIS
>> > T +33 1 81 69 18 22
>> > www.bulac.fr
>> > _______________________________________________
>> > Koha-docs mailing list
>> > Koha-docs at lists.koha-community.org
>> > https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-docs
>>
>
>
>
> --
>
> *Nicolas Legrand*
>  Administration technique et développements du système de gestion de la
> bibliothèque
>
>  [image: Logo BULAC]
>
>  Bibliothèque universitaire
>  des langues et civilisations
>
>  65 rue des Grands Moulins
>  F-75013 PARIS
>  T +33 1 81 69 *18 22*
>  www.bulac.fr
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.koha-community.org/cgi-bin/mailman/private/koha-docs/attachments/20150120/52a9f51c/attachment.html>