View | Details | Raw Unified | Return to bug 21526
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-7 / +1 lines)
Lines 586-600 Link Here
586
                        [% bookseller = order.transferred_to.bookseller %]
586
                        [% bookseller = order.transferred_to.bookseller %]
587
                        [% timestamp = order.transferred_to.timestamp %]
587
                        [% timestamp = order.transferred_to.timestamp %]
588
                        <p>Transferred to basket:
588
                        <p>Transferred to basket:
589
<<<<<<< HEAD
590
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a>
591
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>)
592
                          on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
593
=======
594
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
589
                          <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
595
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
590
                          (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
596
                          on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
591
                          on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
597
>>>>>>> Bug 21526: uri escape TT variables when used in 'a href'
598
                            [% timestamp | $KohaDates %]
592
                            [% timestamp | $KohaDates %]
599
                          </span>
593
                          </span>
600
                        </p>
594
                        </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt (-2 / +2 lines)
Lines 17-25 Link Here
17
        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
17
        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
18
        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> &rsaquo;
18
        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> &rsaquo;
19
        [% IF description %]
19
        [% IF description %]
20
            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a>
20
            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">[% description | html %]</a>
21
        [% ELSIF batch_id %]
21
        [% ELSIF batch_id %]
22
            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a>
22
            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">([% batch_id | html %])</a>
23
        [% ELSE %]
23
        [% ELSE %]
24
            New
24
            New
25
        [% END %]
25
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-2 / +2 lines)
Lines 16-24 Link Here
16
        <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
16
        <a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a> &rsaquo;
17
        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Batches</a> &rsaquo;
17
        <a href="/cgi-bin/koha/patroncards/manage.pl?card_element=batch">Batches</a> &rsaquo;
18
        [% IF description %]
18
        [% IF description %]
19
            Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">[% description | html %]</a>
19
            Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">[% description | html %]</a>
20
        [% ELSIF batch_id %]
20
        [% ELSIF batch_id %]
21
            Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | html %]">([% batch_id | html %])</a>
21
            Edit <a href="/cgi-bin/koha/patroncards/edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">([% batch_id | html %])</a>
22
        [% ELSE %]
22
        [% ELSE %]
23
            New
23
            New
24
        [% END %]
24
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-4 / +3 lines)
Lines 441-455 $(document).ready(function() { Link Here
441
                [% INCLUDE 'serials-menu.inc' %]
441
                [% INCLUDE 'serials-menu.inc' %]
442
                <ul>
442
                <ul>
443
                    [% FOREACH subscription IN subscriptions %]
443
                    [% FOREACH subscription IN subscriptions %]
444
                        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="serial collection for [% subscription.bibliotitle | html %]">Serial collection #[% subscription.subscriptionid | html %]</a></li>
444
                        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="serial collection for [% subscription.bibliotitle | uri %]">Serial collection #[% subscription.subscriptionid | html %]</a></li>
445
                        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
445
                        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid | html %]</a></li>
446
                        [% IF ( subscription.abouttoexpire ) %]
446
                        [% IF ( subscription.abouttoexpire ) %]
447
                            [% UNLESS subscription.closed %]
447
                            [% UNLESS subscription.closed %]
448
                                <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
448
                                <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid | html %])">Renew #[% subscription.subscriptionid | html %]</a></li>
449
                            [% END %]
449
                            [% END %]
450
                        [% END %]
450
                        [% END %]
451
                    [% END %]
451
                    [% END %]
452
                    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% biblionumber | html %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
452
                    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% biblionumber | uri %]" title="go to [% bibliotitle | html %]">Show biblio</a></li></ul>
453
            </aside>
453
            </aside>
454
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
454
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
455
     </div> <!-- /.row -->
455
     </div> <!-- /.row -->
456
- 

Return to bug 21526