oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix importing an Archive in default order. Update the test to now explicitly test for archive order. Fixes bug #11866.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-20 11:45:30 -07:00
parent c141978be1
commit 4899bcd7c4
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -127,12 +127,9 @@ sub addArchive {
$archive->extract( $tempdirName );
# Get all the files in the archive
my @files;
my $wanted = sub { push @files, $File::Find::name; $outputSub->('Found file: %s', $File::Find::name); };
find( {
wanted => $wanted,
}, $tempdirName );
$outputSub->('Getting list of files for sorting purposes');
my @files = map { File::Spec->catfile($tempdirName, $_); } $archive->files;
# Sort files by date
if ($sortBy eq 'date') {
# Hash for storing last modified timestamps

6
lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm
View file

@ -672,6 +672,12 @@ our $I18N = {
context => 'label for progress bar in addArchive',
},
'Getting list of files for sorting purposes' => {
message => 'Getting list of files for sorting purposes',
lastUpdated => 1237403498,
context => 'label for progress bar in addArchive',
},
'Found file: %s' => {
message => 'Found file %s',
lastUpdated => 1237403498,