Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Improve the style of the header and cells of the import spreadsheet t… #10154

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Improve the style of the header and cells of the import spreadsheet t… #10154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ffbd30
Improve the style of the header and cells of the import spreadsheet t…
lilymedway Apr 20, 2024
080b2aa
Automatically unselect images when source image is deleted #9793
lilymedway Apr 20, 2024
c8801b0
Merge branch 'main' into main
lilymedway Apr 21, 2024
333e325
Merge branch 'main' into main
lilymedway Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cgi/generate_sample_import_file.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
recommended => $workbook->add_format(
border => 1,
bold => 1,
bg_color => '#1f6ced',
bg_color => '#0f55cc',
color => 'white',
valign => 'vcenter',
align => 'center'
),
optional => $workbook->add_format(
border => 1,
bold => 1,
bg_color => '#4d89f1',
bg_color => '#0f55cc',
color => 'white',
valign => 'vcenter',
align => 'center'
Expand Down Expand Up @@ -259,4 +259,4 @@
$worksheet_categories->write($i, 0, $category_entry);
}

exit(0);
exit(0);
1 change: 1 addition & 0 deletions lib/ProductOpener/Config_off.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ $flavor = 'off';
stephane
tacinte
teolemon
lmedway
);

%options = (
Expand Down
178 changes: 60 additions & 118 deletions lib/ProductOpener/Images.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,128 +1100,70 @@ sub process_image_upload ($product_id, $imagefield, $user_id, $time, $comment, $

sub process_image_move ($user_id, $code, $imgids, $move_to, $ownerid) {

# move images only to trash or another valid barcode (number)
if (($move_to ne 'trash') and ($move_to !~ /^((off|obf|opf|opff):)?\d+$/)) {
return "invalid barcode number: $move_to";
}

my $product_id = product_id_for_owner($ownerid, $code);
my $move_to_id = product_id_for_owner($ownerid, $move_to);

$log->debug("process_image_move - start", {product_id => $product_id, imgids => $imgids, move_to_id => $move_to_id})
if $log->is_debug();

my $path = product_path_from_id($product_id);

my $product_ref = retrieve_product($product_id);
defined $product_ref->{images} or $product_ref->{images} = {};

# iterate on each images

foreach my $imgid (split(/,/, $imgids)) {

next if ($imgid !~ /^\d+$/);

# check the imgid exists
if (defined $product_ref->{images}{$imgid}) {

my $ok = 1;

my $new_imgid;
my $debug;

if ($move_to =~ /^((off|obf|opf|opff):)?\d+$/) {
$ok = process_image_upload(
$move_to_id,
"$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
$product_ref->{images}{$imgid}{uploader},
$product_ref->{images}{$imgid}{uploaded_t},
"image moved from product $code on $server_domain by $user_id -- uploader: $product_ref->{images}{$imgid}{uploader} - time: $product_ref->{images}{$imgid}{uploaded_t}",
\$new_imgid,
\$debug
);
if ($ok < 0) {
$log->error(
"could not move image to other product",
{
source_path => "$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
move_to => $move_to,
old_code => $code,
ownerid => $ownerid,
user_id => $user_id,
result => $ok
}
);
}
else {
$log->info(
"moved image to other product",
{
source_path => "$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
move_to => $move_to,
old_code => $code,
ownerid => $ownerid,
user_id => $user_id,
result => $ok
}
);
}
}
else {
$log->info(
"moved image to trash",
{
source_path => "$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
old_code => $code,
ownerid => $ownerid,
user_id => $user_id,
result => $ok
}
);
}

# Don't delete images to be moved if they weren't moved correctly
if ($ok) {
# Delete images (move them to the deleted.images dir
ensure_dir_created_or_die($BASE_DIRS{DELETED_IMAGES});

File::Copy->import(qw( move ));

$log->info(
"moving source image to deleted images directory",
{
source_path => "$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
destination_path => "$BASE_DIRS{DELETED_IMAGES}/product.$code.$imgid.jpg"
}
);

move(
"$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
"$BASE_DIRS{DELETED_IMAGES}/product.$code.$imgid.jpg"
);
move(
"$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.$thumb_size.jpg",
"$BASE_DIRS{DELETED_IMAGES}/product.$code.$imgid.$thumb_size.jpg"
);
move(
"$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.$crop_size.jpg",
"$BASE_DIRS{DELETED_IMAGES}/product.$code.$imgid.$crop_size.jpg"
);

delete $product_ref->{images}{$imgid};

}

}
# move images only to trash or another valid barcode (number)
if (($move_to ne 'trash') and ($move_to !~ /^((off|obf|opf|opff):)?\d+$/)) {
return "invalid barcode number: $move_to";
}

my $product_id = product_id_for_owner($ownerid, $code);
my $move_to_id = product_id_for_owner($ownerid, $move_to);

$log->debug("process_image_move - start", {product_id => $product_id, imgids => $imgids, move_to_id => $move_to_id})
if $log->is_debug();

my $path = product_path_from_id($product_id);

my $product_ref = retrieve_product($product_id);
defined $product_ref->{images} or $product_ref->{images} = {};

# iterate on each image
foreach my $imgid (split(/,/, $imgids)) {
next if ($imgid !~ /^\d+$/);

# check the imgid exists
if (defined $product_ref->{images}{$imgid}) {

my $ok = 1;

my $new_imgid;
my $debug;

if ($move_to =~ /^((off|obf|opf|opff):)?\d+$/) {
# Moving to another product, handle this differently
$ok = process_image_upload(
$move_to_id,
"$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
$product_ref->{images}{$imgid}{uploader},
$product_ref->{images}{$imgid}{uploaded_t},
"image moved from product $code on $server_domain by $user_id -- uploader: $product_ref->{images}{$imgid}{uploader} - time: $product_ref->{images}{$imgid}{uploaded_t}",
\$new_imgid,
\$debug
);
} else {
$log->info("moved image to trash", {source_path => "$BASE_DIRS{PRODUCTS_IMAGES}/$path/$imgid.jpg",
old_code => $code, ownerid => $ownerid, user_id => $user_id,
result => $ok});
}

}
# Unselect the image if it was selected
if ($ok) {
foreach my $field (keys %{$product_ref->{selected_images}}) {
if ($product_ref->{selected_images}{$field} eq $imgid) {
process_image_unselect($user_id, $product_ref, $field);
$log->debug("Image unselected because it was deleted: field: $field imgid: $imgid", {}) if $log->is_debug();
}
}
delete $product_ref->{images}{$imgid};
}
}
}

store_product($user_id, $product_ref, "Moved images $imgids to $move_to");
store_product($user_id, $product_ref, "Moved images $imgids to $move_to");

$log->debug("process_image_move - end", {product_id => $product_id, imgids => $imgids, move_to_id => $move_to_id})
if $log->is_debug();
$log->debug("process_image_move - end", {product_id => $product_id, imgids => $imgids, move_to_id => $move_to_id})
if $log->is_debug();

return 0;
return 0;
}

sub process_image_crop ($user_id, $product_id, $id, $imgid, $angle, $normalize, $white_magic, $x1, $y1, $x2, $y2,
Expand Down
Loading