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

(-)a/C4/Update/Database.pm (-11 / +13 lines)
Lines 102-108 sub get_md5 { Link Here
102
=cut
102
=cut
103
103
104
sub execute_version {
104
sub execute_version {
105
    my ( $version ) = @_;
105
    my ( $version, $args ) = @_;
106
    my $report;
106
    my $report;
107
107
108
    my $filepath;
108
    my $filepath;
Lines 118-133 sub execute_version { Link Here
118
    my $filename = $version . $extension;
118
    my $filename = $version . $extension;
119
119
120
    my $md5 = get_md5 $filepath;
120
    my $md5 = get_md5 $filepath;
121
    my $r = md5_already_exists( $md5 );
121
    unless ( $args->{force} ) {
122
    if ( scalar @$r ) {
122
        my $r = md5_already_exists( $md5 );
123
        my $p = @$r[0];
123
        if ( scalar @$r ) {
124
        $report->{$version} = {
124
            my $p = @$r[0];
125
            error => "ALREADY_EXISTS",
125
            $report->{$version} = {
126
            filepath => $filepath,
126
                error => "ALREADY_EXISTS",
127
            old_version => @$r[0]->{version},
127
                filepath => $filepath,
128
            md5 => @$r[0]->{md5},
128
                old_version => @$r[0]->{version},
129
        };
129
                md5 => @$r[0]->{md5},
130
        return $report;
130
            };
131
            return $report;
132
        }
131
    }
133
    }
132
134
133
    my $queries;
135
    my $queries;
(-)a/admin/updatedatabase.pl (+6 lines)
Lines 71-76 if ( $op eq 'mark_as_ok' ) { Link Here
71
    $op = 'list';
71
    $op = 'list';
72
}
72
}
73
73
74
if ( $op eq 'force_update' ) {
75
    my $version = $query->param('version');
76
    C4::Update::Database::execute_version $version, {force => 1};
77
    $op = 'list';
78
}
79
74
if ( $op eq 'list' ) {
80
if ( $op eq 'list' ) {
75
    my $versions_available = C4::Update::Database::list_versions_available;
81
    my $versions_available = C4::Update::Database::list_versions_available;
76
    my $versions = C4::Update::Database::list_versions_already_applied;
82
    my $versions = C4::Update::Database::list_versions_already_applied;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/updatedatabase.tt (-1 / +2 lines)
Lines 77-82 Link Here
77
                    <span style="color:orange;">
77
                    <span style="color:orange;">
78
                      [% r.error.filepath %] already executed in version [% r.error.old_version %] : same md5 ([% r.error.md5 %])
78
                      [% r.error.filepath %] already executed in version [% r.error.old_version %] : same md5 ([% r.error.md5 %])
79
                      [<a href="/cgi-bin/koha/admin/updatedatabase.pl?op=mark_as_ok&version=[% report_loo.version %]">Mark as OK</a>]
79
                      [<a href="/cgi-bin/koha/admin/updatedatabase.pl?op=mark_as_ok&version=[% report_loo.version %]">Mark as OK</a>]
80
                      or
81
                      [<a href="/cgi-bin/koha/admin/updatedatabase.pl?op=force_update&version=[% report_loo.version %]">execute anyway</a>]
80
                    </span>
82
                    </span>
81
                  [% ELSIF r.error.error == "LOAD_FUNCTIONS_FAILED" %]
83
                  [% ELSIF r.error.error == "LOAD_FUNCTIONS_FAILED" %]
82
                    <span style="color:red;">
84
                    <span style="color:red;">
83
- 

Return to bug 9326