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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc (-13 / +13 lines)
Lines 2-32 Link Here
2
<div class="dialog alert">
2
<div class="dialog alert">
3
  <p>
3
  <p>
4
    <strong>WARNING:</strong>
4
    <strong>WARNING:</strong>
5
        [% IF ( 101 ) %]
5
        [% IF ( error == 101 ) %]
6
        The database returned an error while [% IF ( card_element ) %]saving [% card_element %] [% element_id %][% ELSE %]attempting a save operation[% END %]. Please have your system administrator check the error log for details.
6
        The database returned an error while [% IF ( card_element ) %]saving [% card_element %] [% element_id %][% ELSE %]attempting a save operation[% END %]. Please have your system administrator check the error log for details.
7
        [% ELSIF ( 102 ) %]
7
        [% ELSIF ( error == 102 ) %]
8
        The database returned an error while [% IF ( card_element ) %]deleting [% card_element %] [% element_id %][% ELSIF ( image_ids ) %][% image_ids %][% ELSE %]attempting a delete operation[% END %]. Please have your system administrator check the error log for details.
8
        The database returned an error while [% IF ( card_element ) %]deleting [% card_element %] [% element_id %][% ELSIF ( image_ids ) %][% image_ids %][% ELSE %]attempting a delete operation[% END %]. Please have your system administrator check the error log for details.
9
        [% ELSIF ( 201 ) %]
9
        [% ELSIF ( error == 201 ) %]
10
        An unsupported operation was attempted[% IF ( element_id ) %] on [% card_element %] [% element_id %][% END %]. Please have your system administrator check the error log for details.
10
        An unsupported operation was attempted[% IF ( element_id ) %] on [% card_element %] [% element_id %][% END %]. Please have your system administrator check the error log for details.
11
        [% ELSIF ( 202 ) %]
11
        [% ELSIF ( error == 202 ) %]
12
        An error has occurred. Please ask your system administrator to check the error log for more details.
12
        An error has occurred. Please ask your system administrator to check the error log for more details.
13
        [% ELSIF ( 203 ) %]
13
        [% ELSIF ( error == 203 ) %]
14
        A non-existent or invalid library code was supplied. Please <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a library selected.
14
        A non-existent or invalid library code was supplied. Please <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a library selected.
15
        [% ELSIF ( 301 ) %]
15
        [% ELSIF ( error == 301 ) %]
16
        An error has occurred while attempting to upload the image file. Please ask you system administrator to check the error log for more details.
16
        An error has occurred while attempting to upload the image file. Please ask you system administrator to check the error log for more details.
17
        [% ELSIF ( 302 ) %]
17
        [% ELSIF ( error == 302 ) %]
18
        Image exceeds 500KB. Please resize and import again.
18
        Image exceeds 500KB. Please resize and import again.
19
        [% ELSIF ( 303 ) %]
19
        [% ELSIF ( error == 303 ) %]
20
        The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space.
20
        The database image quota currently only allows a maximum of [% image_limit %] images to be stored at any one time. Please delete one or more images to free up quota space.
21
        [% ELSIF ( 401 ) %]
21
        [% ELSIF ( error == 401 ) %]
22
        An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details.
22
        An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details.
23
        [% ELSIF ( 402 ) %]
23
        [% ELSIF ( error == 402 ) %]
24
        The item(s) was not added because the library is not set. Please set your library before adding items to a batch.
24
        The item(s) was not added because the library is not set. Please set your library before adding items to a batch.
25
        [% ELSIF ( 403 ) %]
25
        [% ELSIF ( error == 403 ) %]
26
        An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details.
26
        An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details.
27
        [% ELSIF ( 404 ) %]
27
        [% ELSIF ( error == 404 ) %]
28
        An error has occurred and batch [% batch_id %] was not deleted.  Please have your system administrator check the error log for details.
28
        An error has occurred and batch [% batch_id %] was not deleted.  Please have your system administrator check the error log for details.
29
        [% ELSIF ( 405 ) %]
29
        [% ELSIF ( error == 405 ) %]
30
        An error has occurred and batch [% batch_id %] not fully de-duplicated.
30
        An error has occurred and batch [% batch_id %] not fully de-duplicated.
31
        [% ELSE %]
31
        [% ELSE %]
32
        [% END %]
32
        [% END %]
(-)a/patroncards/edit-batch.pl (-2 / +1 lines)
Lines 133-140 $template->param( Link Here
133
                table_loop              => $table,
133
                table_loop              => $table,
134
                duplicate_message       => $duplicate_message,
134
                duplicate_message       => $duplicate_message,
135
                duplicate_count         => $duplicate_count,
135
                duplicate_count         => $duplicate_count,
136
                error                   => ($errstr ? 1 : 0),
136
                error                   => $errstr,
137
                $errstr                 => 1,
138
                );
137
                );
139
138
140
output_html_with_http_headers $cgi, $cookie, $template->output;
139
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/patroncards/image-manage.pl (-10 / +5 lines)
Lines 54-61 if ($op eq 'upload') { Link Here
54
            SOURCE_FILE => $source_file,
54
            SOURCE_FILE => $source_file,
55
            IMAGE_NAME => $image_name,
55
            IMAGE_NAME => $image_name,
56
            TABLE => $table,
56
            TABLE => $table,
57
            error => 1,
57
            error => $errstr,
58
            $errstr => 1,
59
        );
58
        );
60
    }
59
    }
61
    else {
60
    else {
Lines 69-76 if ($op eq 'upload') { Link Here
69
                SOURCE_FILE => $source_file,
68
                SOURCE_FILE => $source_file,
70
                IMAGE_NAME => $image_name,
69
                IMAGE_NAME => $image_name,
71
                TABLE => $table,
70
                TABLE => $table,
72
                error => 1,
71
                error => $errstr,
73
                $errstr => 1,
74
            );
72
            );
75
        }
73
        }
76
        else {
74
        else {
Lines 87-94 if ($op eq 'upload') { Link Here
87
                    SOURCE_FILE => $source_file,
85
                    SOURCE_FILE => $source_file,
88
                    IMAGE_NAME => $image_name,
86
                    IMAGE_NAME => $image_name,
89
                    TABLE => $table,
87
                    TABLE => $table,
90
                    error => 1,
88
                    error => $errstr,
91
                    $errstr => 1,
92
                    image_limit => $image_limit,
89
                    image_limit => $image_limit,
93
                );
90
                );
94
            }
91
            }
Lines 120-127 elsif ($op eq 'delete') { Link Here
120
            DELETE_SUCCESSFULL => 0,
117
            DELETE_SUCCESSFULL => 0,
121
            IMAGE_IDS => join(', ', @image_ids),
118
            IMAGE_IDS => join(', ', @image_ids),
122
            TABLE => $table,
119
            TABLE => $table,
123
            error => 1,
120
            error => $errstr,
124
            $errstr => 1,
125
            image_ids => join(',',@image_ids),
121
            image_ids => join(',',@image_ids),
126
        );
122
        );
127
    }
123
    }
Lines 149-156 else { # to trap unsupported operations Link Here
149
        SOURCE_FILE => $source_file,
145
        SOURCE_FILE => $source_file,
150
        IMAGE_NAME => $image_name,
146
        IMAGE_NAME => $image_name,
151
        TABLE => $table,
147
        TABLE => $table,
152
        error => 1,
148
        error => $errstr,
153
        $errstr => 1,
154
    );
149
    );
155
}
150
}
156
151
(-)a/patroncards/manage.pl (-3 / +1 lines)
Lines 101-108 my $table = html_table($display_columns->{$card_element}, $db_rows); Link Here
101
101
102
$template->param(print => 1) if ($card_element eq 'batch');
102
$template->param(print => 1) if ($card_element eq 'batch');
103
$template->param(
103
$template->param(
104
                error           => ($errstr ? 1 : 0),
104
                error           => $errstr,
105
                $errstr         => 1,
106
);
105
);
107
$template->param(
106
$template->param(
108
                op              => $op,
107
                op              => $op,
109
- 

Return to bug 9924