stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-30 01:59:11 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for ticket #1118. Create a item::save_with_retries helper method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly.

Browse Source
This commit is contained in:
Tim Almdal
2010-06-15 14:18:23 -07:00
parent 2492280cc0
commit 9504f71efc
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gallery/controllers/simple_uploader.php
View File

@@ -65,12 +65,16 @@ class Simple_Uploader_Controller extends Controller {
if (array_key_exists("extension", $path_info) &&
in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
$item->type = "movie";
$item->save();
} else {
$item->type = "photo";
}
item::save_with_retries($item);
if ($item->type == "movie") {
log::success("content", t("Added a movie"),
html::anchor("movies/$item->id", t("view movie")));
} else {
$item->type = "photo";
$item->save();
log::success("content", t("Added a photo"),
html::anchor("photos/$item->id", t("view photo")));
}

17
modules/gallery/helpers/item.php
View File

@@ -43,6 +43,17 @@ class item_Core {
// Moving may result in name or slug conflicts. If that happens, try up to 5 times to pick a
// random name (or slug) to avoid the conflict.
$message = item::save_with_retries($source);
// If the target has no cover item, make this it.
if ($target->album_cover_item_id == null) {
item::make_album_cover($source);
}
return $message;
}
static function save_with_retries($source, $retries=5) {
$orig_name = $source->name;
$orig_name_filename = pathinfo($source->name, PATHINFO_FILENAME);
$orig_name_extension = pathinfo($source->name, PATHINFO_EXTENSION);
@@ -91,12 +102,6 @@ class item_Core {
}
}
}
// If the target has no cover item, make this it.
if ($target->album_cover_item_id == null) {
item::make_album_cover($source);
}
return $message;
}

8
modules/gallery/helpers/item_rest.php
View File

@@ -112,8 +112,6 @@ class item_rest_Core {
}
break;
case "parent":
break;
default:
if (property_exists($entity, $key)) {
$item->$key = $entity->$key;
@@ -126,7 +124,7 @@ class item_rest_Core {
$parent = rest::resolve($entity->parent);
item::move($item, $parent);
} else {
$item->save();
$item::save_with_retries($item);
}
}
@@ -157,7 +155,7 @@ class item_rest_Core {
$item->title = isset($entity->title) ? $entity->title : $entity->name;
$item->description = isset($entity->description) ? $entity->description : null;
$item->slug = isset($entity->slug) ? $entity->slug : null;
$item->save();
$item::save_with_retries($item);
break;
case "photo":
@@ -172,7 +170,7 @@ class item_rest_Core {
$item->title = isset($entity->title) ? $entity->title : $entity->name;
$item->description = isset($entity->description) ? $entity->description : null;
$item->slug = isset($entity->slug) ? $entity->slug : null;
$item->save();
$item::save_with_retries($item);
break;
default: