Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f6c3d7d6

Von Tamino Steinert vor 11 Monaten hinzugefügt

  • ID f6c3d7d60c6eeb3eaa728e4f3e8a3a74db2ad71d
  • Vorgänger 6da526ef
  • Nachfolger 265db870

S:C:File: verwende 'guid' statt 'id' beim Umbenennen

Die der Wert hinter der Checkbox beim Auswählen der Datei wurde von
'id' auf 'guid' geändert.

Unterschiede anzeigen:

SL/Controller/File.pm
sub action_ajax_rename {
my ($self) = @_;
my ($id, $version) = split /_/, $::form->{id};
my $file = SL::File->get(id => $id);
my $guid = $::form->{id};
my $file = SL::File->get(guid => $guid);
if ( ! $file ) {
$self->js->flash('error', $::locale->text('File not exists !'))->render();
return;
......
);
if ($existobj) {
push @existing, $existobj->id.'_'.$sfile->file_name;
push @existing, ($existobj->versions)[0]->file_version->guid.'_'.$sfile->file_name;
} else {
my $fileobj = SL::File->save(object_id => $self->object_id,
object_type => $self->object_type,
......
$self->js->html('#'.$self->file_type.'_list_'.$self->object_type, $output);
if ( $self->existing && scalar(@{$self->existing}) > 0) {
my $first = shift @{$self->existing};
my ($first_id, $sfile) = split('_', $first, 2);
my $file = SL::File->get(id => $first_id );
$self->js->run('kivi.File.askForRename', $first_id, $file->file_type, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
my ($first_guid, $sfile) = split('_', $first, 2);
my $file = SL::File->get(guid => $first_guid );
$self->js->run('kivi.File.askForRename', $first_guid, $file->file_type, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
}
$self->js->render();
} else {

Auch abrufbar als: Unified diff