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

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 261-267 sub get_template_and_user { Link Here
261
        }
261
        }
262
262
263
        # user info
263
        # user info
264
        $template->param( loggedinusername   => $user ); # FIXME Should be replaced with something like patron-title.inc
264
        $template->param( loggedinusername   => $user ); # OBSOLETE - Do not reuse this in template, use logged_in_user.userid instead
265
        $template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber
265
        $template->param( loggedinusernumber => $borrowernumber ); # FIXME Should be replaced with logged_in_user.borrowernumber
266
        $template->param( logged_in_user     => $patron );
266
        $template->param( logged_in_user     => $patron );
267
        $template->param( sessionID          => $sessionID );
267
        $template->param( sessionID          => $sessionID );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-2 / +2 lines)
Lines 59-65 Link Here
59
                        <i class="fa fa-user"></i>
59
                        <i class="fa fa-user"></i>
60
                    </span>
60
                    </span>
61
                    <span id="logged-in-info-full">
61
                    <span id="logged-in-info-full">
62
                        <span class="loggedinusername">[% loggedinusername | html %]</span>
62
                        <span class="loggedinusername">[% logged_in_user.userid | html %]</span>
63
                        <span class="separator">|</span>
63
                        <span class="separator">|</span>
64
                        [% IF ( AutoLocation ) %]
64
                        [% IF ( AutoLocation ) %]
65
                            <brand>
65
                            <brand>
Lines 82-88 Link Here
82
82
83
                    <li class="loggedin-menu-label">
83
                    <li class="loggedin-menu-label">
84
                        Logged in as:<br />
84
                        Logged in as:<br />
85
                        <span class="loggedinusername">[% loggedinusername | html %]</span>
85
                        <span class="loggedinusername">[% logged_in_user.userid | html %]</span>
86
                    </li>
86
                    </li>
87
                    <li class="loggedin-menu-label">
87
                    <li class="loggedin-menu-label">
88
                        [% IF ( AutoLocation ) %]
88
                        [% IF ( AutoLocation ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 88-94 Link Here
88
88
89
[% UNLESS no_orders_to_display %]
89
[% UNLESS no_orders_to_display %]
90
<div id="acqui_receive_summary">
90
<div id="acqui_receive_summary">
91
<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Received by:</strong> [% loggedinusername | html %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
91
<p><strong>Invoice number:</strong> [% invoice | html %] <strong>Received by:</strong> [% logged_in_user.userid | html %]<strong>On:</strong> [% datereceived | $KohaDates %]</p>
92
</div>
92
</div>
93
[% UNLESS (invoiceclosedate) %]
93
[% UNLESS (invoiceclosedate) %]
94
  <div id="acqui_receive_search">
94
  <div id="acqui_receive_search">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt (-1 / +1 lines)
Lines 309-315 Link Here
309
        }
309
        }
310
310
311
        function synchronize() {
311
        function synchronize() {
312
            kohadb.saveSetting("userid", "[% loggedinusername | html %]");
312
            kohadb.saveSetting("userid", "[% logged_in_user.userid | html %]");
313
            kohadb.saveSetting("branchcode", "[% LoginBranchcode | html %]");
313
            kohadb.saveSetting("branchcode", "[% LoginBranchcode | html %]");
314
            showSyncInfo();
314
            showSyncInfo();
315
            [% UNLESS (AllowOfflineCirculation) %]
315
            [% UNLESS (AllowOfflineCirculation) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt (-1 / +1 lines)
Lines 62-68 Link Here
62
                    </li>
62
                    </li>
63
63
64
                    <li>
64
                    <li>
65
                        <span class="label">Owner: </span>[% loggedinusername | html %]
65
                        <span class="label">Owner: </span>[% logged_in_user.userid | html %]
66
                    </li>
66
                    </li>
67
                </ol>
67
                </ol>
68
68
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 / +1 lines)
Lines 31-37 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
31
                [% ELSE %]
31
                [% ELSE %]
32
                        <input type="hidden" name="op" value="addsubscription" />
32
                        <input type="hidden" name="op" value="addsubscription" />
33
                [% END %]
33
                [% END %]
34
                <input type="hidden" name="user" value="[% loggedinusername | html %]" />
34
                <input type="hidden" name="user" value="[% logged_in_user.userid | html %]" />
35
                <input type="hidden" name="irreg_check" value="0" />
35
                <input type="hidden" name="irreg_check" value="0" />
36
36
37
                <div id="page_1">
37
                <div id="page_1">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +2 lines)
Lines 282-293 Link Here
282
            <li>
282
            <li>
283
                <span class="label">Owner: </span>
283
                <span class="label">Owner: </span>
284
                [% IF op == 'add_form' %]
284
                [% IF op == 'add_form' %]
285
                    <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" />[% loggedinusername | html %]</li>
285
                    <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
286
                [% ELSE %]
286
                [% ELSE %]
287
                    [% IF owner %]
287
                    [% IF owner %]
288
                        <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" />[% owner.firstname _ ' ' _ owner.surname | html %]
288
                        <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" />[% owner.firstname _ ' ' _ owner.surname | html %]
289
                    [% ELSE %]
289
                    [% ELSE %]
290
                        <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[% loggedinusername | html %]
290
                        <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
291
                    [% END %]
291
                    [% END %]
292
                [% END %]
292
                [% END %]
293
            </li>
293
            </li>
294
- 

Return to bug 21096