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

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

Return to bug 21096