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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-3 / +8 lines)
Lines 11-23 Link Here
11
        $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
11
        $("#invoice_files_details_table").dataTable($.extend(true, {}, dataTablesDefaults, {
12
            "aoColumnDefs": [
12
            "aoColumnDefs": [
13
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
13
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
14
                { "aTargets": [ 3 ], "sType": "natural" }
14
                { "aTargets": [ "title-string" ], "sType": "title-string" }
15
            ],
15
            ],
16
            bInfo: false,
16
            bInfo: false,
17
            bPaginate: false,
17
            bPaginate: false,
18
            bFilter: false,
18
            bFilter: false,
19
            sDom: "t"
19
            sDom: "t"
20
        }));
20
        }));
21
        $("a.delete_file").click(function(){
22
            return ( confirm( _("Are you sure you want to delete this file ?") ) );
23
        });
21
    });
24
    });
22
//]]>
25
//]]>
23
</script>
26
</script>
Lines 62-70 Link Here
62
                      <td><a href="?invoiceid=[% invoiceid %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
65
                      <td><a href="?invoiceid=[% invoiceid %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
63
                      <td>[% f.file_type | html %]</td>
66
                      <td>[% f.file_type | html %]</td>
64
                      <td>[% f.file_description | html %]</td>
67
                      <td>[% f.file_description | html %]</td>
65
                      <td><!-- [% f.date_uploaded %] -->[% f.date_uploaded | $KohaDates %]</td>
68
                      <td class="title-string">
69
                        <span title="[% f.date_uploaded %]">[% f.date_uploaded | $KohaDates %]</span>
70
                      </td>
66
                      <td>[% f.file_size %]</td>
71
                      <td>[% f.file_size %]</td>
67
                      <td><a href="?invoiceid=[% invoiceid %]&amp;op=delete&amp;file_id=[% f.file_id %]">Delete</a></td>
72
                      <td><a class="delete_file" href="?invoiceid=[% invoiceid %]&amp;op=delete&amp;file_id=[% f.file_id %]">Delete</a></td>
68
                      <td><a href="?invoiceid=[% invoiceid %]&amp;op=download&amp;file_id=[% f.file_id %]">Download</a></td>
73
                      <td><a href="?invoiceid=[% invoiceid %]&amp;op=download&amp;file_id=[% f.file_id %]">Download</a></td>
69
                  </tr>
74
                  </tr>
70
                [% END %]
75
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +4 lines)
Lines 31-37 Link Here
31
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
31
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
32
        $("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, {
32
        $("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, {
33
            "aoColumnDefs": [
33
            "aoColumnDefs": [
34
                { "aTargets": [ 3 ], "sType": "natural" }
34
                { "aTargets": [ "title-string" ], "sType": "title-string" }
35
            ],
35
            ],
36
            bInfo: false,
36
            bInfo: false,
37
            bPaginate: false,
37
            bPaginate: false,
Lines 229-235 Link Here
229
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
229
                         <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
230
                         <td>[% f.file_type | html %]</td>
230
                         <td>[% f.file_type | html %]</td>
231
                         <td>[% f.file_description | html %]</td>
231
                         <td>[% f.file_description | html %]</td>
232
                         <td><!-- [% f.date_uploaded %] -->[% f.date_uploaded | $KohaDates %]</td>
232
                         <td class="title-string">
233
                           <span title="[% f.date_uploaded %]">[% f.date_uploaded | $KohaDates %]</span>
234
                         </td>
233
                    </tr>
235
                    </tr>
234
                [% END %]
236
                [% END %]
235
                </tbody>
237
                </tbody>
(-)a/t/db_dependent/Koha_Misc_Files.t (-4 / +6 lines)
Lines 5-11 Link Here
5
5
6
use Modern::Perl;
6
use Modern::Perl;
7
use C4::Context;
7
use C4::Context;
8
use Test::More tests => 27;
8
use Test::More tests => 30;
9
9
10
BEGIN {
10
BEGIN {
11
    use_ok('Koha::Misc::Files');
11
    use_ok('Koha::Misc::Files');
Lines 16-21 $dbh->{AutoCommit} = 0; Link Here
16
$dbh->{RaiseError} = 1;
16
$dbh->{RaiseError} = 1;
17
17
18
## new() parameter handling check
18
## new() parameter handling check
19
is(Koha::Misc::Files->new(), undef, "new() param check test/0");
19
is(Koha::Misc::Files->new(recordid => 12), undef, "new() param check test/1");
20
is(Koha::Misc::Files->new(recordid => 12), undef, "new() param check test/1");
20
is(Koha::Misc::Files->new(recordid => 'aa123', tabletag => 'ttag_a'), undef, "new() param check test/2");
21
is(Koha::Misc::Files->new(recordid => 'aa123', tabletag => 'ttag_a'), undef, "new() param check test/2");
21
22
Lines 76-85 $files_a_123_infos = $mf_a_123->GetFilesInfo(); Link Here
76
is(scalar @$files_a_123_infos, 3, "GetFilesInfo() result count after DelFile()");
77
is(scalar @$files_a_123_infos, 3, "GetFilesInfo() result count after DelFile()");
77
78
78
## DelAllFiles() tests
79
## DelAllFiles() tests
79
$mf_a_123->DelAllFiles();
80
my $number_of_deleted_files_a_123 = $mf_a_123->DelAllFiles();
81
is( $number_of_deleted_files_a_123, 3, "DelAllFiles returns the number of deleted files/1" );
80
$files_a_123_infos = $mf_a_123->GetFilesInfo();
82
$files_a_123_infos = $mf_a_123->GetFilesInfo();
81
is(scalar @$files_a_123_infos, 0, "GetFilesInfo() result count after DelAllFiles()/1");
83
is(scalar @$files_a_123_infos, 0, "GetFilesInfo() result count after DelAllFiles()/1");
82
$mf_b_221->DelAllFiles();
84
my $number_of_deleted_files_b_221 = $mf_b_221->DelAllFiles();
85
is( $number_of_deleted_files_b_221, 1, "DelAllFiles returns the number of deleted files/2" );
83
is(scalar @{$mf_b_221->GetFilesInfo()}, 0, "GetFilesInfo() result count after DelAllFiles()/2");
86
is(scalar @{$mf_b_221->GetFilesInfo()}, 0, "GetFilesInfo() result count after DelAllFiles()/2");
84
87
85
$dbh->rollback;
88
$dbh->rollback;
86
- 

Return to bug 3050