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

(-)a/ill/ill-requests.pl (-2 / +2 lines)
Lines 144-155 if ($backends_available) { Link Here
144
            $op = 'historycheck';
144
            $op = 'historycheck';
145
            $template->param( $history_check->history_check_template_params($params) )
145
            $template->param( $history_check->history_check_template_params($params) )
146
146
147
            # ILLCheckAvailability operation
147
                # ILLCheckAvailability operation
148
        } elsif ( $availability->show_availability($request) ) {
148
        } elsif ( $availability->show_availability($request) ) {
149
            $op = 'availability';
149
            $op = 'availability';
150
            $template->param( $availability->availability_template_params($params) )
150
            $template->param( $availability->availability_template_params($params) )
151
151
152
            # ILLModuleDisclaimerByType operation
152
                # ILLModuleDisclaimerByType operation
153
        } elsif ( $type_disclaimer->show_type_disclaimer($request) ) {
153
        } elsif ( $type_disclaimer->show_type_disclaimer($request) ) {
154
            $op = 'typedisclaimer';
154
            $op = 'typedisclaimer';
155
            $template->param( $type_disclaimer->type_disclaimer_template_params($params) );
155
            $template->param( $type_disclaimer->type_disclaimer_template_params($params) );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/select_manager.inc (-14 / +2 lines)
Lines 2-21 Link Here
2
[% IF add_modal %]
2
[% IF add_modal %]
3
    [% SET columns = ['cardnumber','name','category','branch','action'] %]
3
    [% SET columns = ['cardnumber','name','category','branch','action'] %]
4
    [% SET filter = filter %]
4
    [% SET filter = filter %]
5
    [% PROCESS patron_search_modal
5
    [% PROCESS patron_search_modal columns => columns, modal_title => t("Select manager"), patron_search_modal_id => 'patron_search_modal_manager', table_id => 'patron_search_modal_manager_table' %]
6
        columns => columns,
6
    [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1, table_id => 'patron_search_modal_manager_table', callback => 'select_manager' empty_table_settings => 1 %]
7
        modal_title => t("Select manager"),
8
        patron_search_modal_id => 'patron_search_modal_manager',
9
        table_id => 'patron_search_modal_manager_table'
10
    %]
11
    [% PROCESS patron_search_js
12
        columns => columns,
13
        actions => ["select"],
14
        preview_on_name_click => 1,
15
        table_id => 'patron_search_modal_manager_table',
16
        callback => 'select_manager'
17
        empty_table_settings => 1
18
    %]
19
[% END %]
7
[% END %]
20
<script>
8
<script>
21
    function select_manager(borrowernumber, borrower) {
9
    function select_manager(borrowernumber, borrower) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-13 / +3 lines)
Lines 392-401 Link Here
392
                                <label for="borrowernumber">Patron ID:</label>
392
                                <label for="borrowernumber">Patron ID:</label>
393
                                <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" />
393
                                <input name="borrowernumber" id="borrowernumber" type="text" value="[% request.borrowernumber | html %]" />
394
                            </li>
394
                            </li>
395
                            [% PROCESS select_manager_form
395
                            [% PROCESS select_manager_form manager => request.manager equired_permission => CAN_user_ill %]
396
                                manager => request.manager
397
                                required_permission => CAN_user_ill
398
                            %]
399
                            <li class="biblio_id">
396
                            <li class="biblio_id">
400
                                <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label>
397
                                <label for="biblio_id" class="biblio_id">Bibliographic record ID:</label>
401
                                <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" />
398
                                <input name="biblio_id" id="biblio_id" type="text" value="[% request.biblio_id | html %]" />
Lines 651-660 Link Here
651
                                    <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a>
648
                                    <a href="[% borrowerlink | url %]" title="View borrower details"> [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] </a>
652
                                </li>
649
                                </li>
653
                            [% END %]
650
                            [% END %]
654
                            [% PROCESS select_manager_show
651
                            [% PROCESS select_manager_show manager => request.manager display => "fieldset" %]
655
                                manager => request.manager
656
                                display => "fieldset"
657
                            %]
658
                            [% IF request.biblio_id %]
652
                            [% IF request.biblio_id %]
659
                                <li class="biblio_id">
653
                                <li class="biblio_id">
660
                                    <span class="label biblio_id">Bibliographic record ID:</span>
654
                                    <span class="label biblio_id">Bibliographic record ID:</span>
Lines 1130-1140 Link Here
1130
    [% INCLUDE 'calendar.inc' %]
1124
    [% INCLUDE 'calendar.inc' %]
1131
    [% INCLUDE 'select2.inc' %]
1125
    [% INCLUDE 'select2.inc' %]
1132
    [% IF op == 'edit_action' %]
1126
    [% IF op == 'edit_action' %]
1133
        [% INCLUDE 'select_manager.inc'
1127
        [% INCLUDE 'select_manager.inc' add_modal => 1 manager => request.manager filter => 'ill_users' %]
1134
            add_modal => 1
1135
            manager => request.manager
1136
            filter => 'ill_users'
1137
        %]
1138
    [% END %]
1128
    [% END %]
1139
    [% IF metadata_enrichment_services %]
1129
    [% IF metadata_enrichment_services %]
1140
        <script>
1130
        <script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-22 / +4 lines)
Lines 258-268 Link Here
258
                                    [% END %]
258
                                    [% END %]
259
                                </td>
259
                                </td>
260
                            </tr>
260
                            </tr>
261
                            [%
261
                            [% PROCESS select_manager_show manager => suggestion.manager display => "table" %]
262
                                PROCESS select_manager_show
263
                                manager => suggestion.manager
264
                                display => "table"
265
                            %]
266
                            <tr>
262
                            <tr>
267
                                <th>Accepted on:</th>
263
                                <th>Accepted on:</th>
268
                                <td>[% suggestion.accepteddate | $KohaDates %]</td>
264
                                <td>[% suggestion.accepteddate | $KohaDates %]</td>
Lines 596-607 Link Here
596
                                    <label for="managedon">Managed on:</label>
592
                                    <label for="managedon">Managed on:</label>
597
                                    <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% default_manageddate | html %]" />[% INCLUDE 'date-format.inc' %]
593
                                    <input type="text" id="managedon" name="manageddate" class="flatpickr" size="10" maxlength="10" value="[% default_manageddate | html %]" />[% INCLUDE 'date-format.inc' %]
598
                                </li>
594
                                </li>
599
                                [%
595
                                [% PROCESS select_manager_form manager => suggestion.manager notify_option => 1 required_permission => CAN_user_suggestions_suggestions_manage %]
600
                                    PROCESS select_manager_form
601
                                    manager => suggestion.manager
602
                                    notify_option => 1
603
                                    required_permission => CAN_user_suggestions_suggestions_manage
604
                                %]
605
                            </ol>
596
                            </ol>
606
                        </fieldset>
597
                        </fieldset>
607
598
Lines 882-893 Link Here
882
                                                            [% id_val = "set_manager_" _ suggestion.suggestiontype %]
873
                                                            [% id_val = "set_manager_" _ suggestion.suggestiontype %]
883
                                                            [% data_tab_val = suggestion.suggestiontype %]
874
                                                            [% data_tab_val = suggestion.suggestiontype %]
884
875
885
                                                            [%
876
                                                            [% PROCESS select_manager_button href = hash_href_val id = id_val data_tab = data_tab_val %]
886
                                                                PROCESS select_manager_button
887
                                                                href = hash_href_val
888
                                                                id = id_val
889
                                                                data_tab = data_tab_val
890
                                                            %]
891
                                                            <span id="managedby_name-[% suggestion.suggestiontype | html %]"></span>
877
                                                            <span id="managedby_name-[% suggestion.suggestiontype | html %]"></span>
892
                                                        </fieldset>
878
                                                        </fieldset>
893
                                                        <fieldset class="action">
879
                                                        <fieldset class="action">
Lines 1217-1226 Link Here
1217
1203
1218
[% MACRO jsinclude BLOCK %]
1204
[% MACRO jsinclude BLOCK %]
1219
    [% INCLUDE 'calendar.inc' %]
1205
    [% INCLUDE 'calendar.inc' %]
1220
    [%
1206
    [% INCLUDE 'select_manager.inc' manager => suggestion.manager %]
1221
        INCLUDE 'select_manager.inc'
1222
        manager => suggestion.manager
1223
    %]
1224
    <script>
1207
    <script>
1225
        function select_suggester(borrowernumber, borrower) {
1208
        function select_suggester(borrowernumber, borrower) {
1226
            $.ajax({
1209
            $.ajax({
1227
- 

Return to bug 40504