summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-04-29 03:57:24 +0000
committerTim Almdal <tnalmdal@shaw.ca>2009-04-29 03:57:24 +0000
commit33122e8968e2d7890f7fabe45ce168aa0d217bbb (patch)
tree36e67fd507f9308cd21c185056fc40d7a5a042cd
parent89bdd6ca983585d5bf41968ee355927169cc9e14 (diff)
Change album cover functionality added
-rw-r--r--modules/organize/controllers/organize.php10
-rw-r--r--modules/organize/helpers/organize_task.php14
-rw-r--r--modules/organize/js/organize.js1
3 files changed, 23 insertions, 2 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index c4a9665d..41eea643 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -239,12 +239,20 @@ class Organize_Controller extends Controller {
break;
case "delete":
return array("description" => t("Delete selected photos and albums"),
- "name" => t("`Delete images in %name", array("name" => $item->title)),
+ "name" => t("Delete images in %name", array("name" => $item->title)),
"type" => "delete",
"runningMsg" => t("Delete images in progress"),
"pauseMsg" => t("The delete operation was paused"),
"resumeMsg" => t("The delete operation was resumed"));
break;
+ case "albumCover":
+ return array("description" => t("Reset Album Cover"),
+ "name" => t("Reset Album cover for %name", array("name" => $item->title)),
+ "type" => "albumCover",
+ "runningMsg" => t("Reset Album Cover in progress"),
+ "pauseMsg" => t("Reset album cover was paused"),
+ "resumeMsg" => t("Reset album cover was resumed"));
+ break;
default:
throw new Exception("Operation '$operation' is not implmented");
}
diff --git a/modules/organize/helpers/organize_task.php b/modules/organize/helpers/organize_task.php
index e66795b8..c0315aba 100644
--- a/modules/organize/helpers/organize_task.php
+++ b/modules/organize/helpers/organize_task.php
@@ -52,6 +52,20 @@ class organize_task_Core {
self:: _do_rotation($item, $taskType == "rotateCcw" ? -90 : 90);
}
break;
+ case "albumCover":
+ $item = ORM::factory("item", $id);
+ $parent = $item->parent();
+
+ if ($item->is_photo()) {
+ $parent->album_cover_item_id = $item->id;
+ } else if ($item->is_album()) {
+ $parent->album_cover_item_id = $item->album_cover_item_id;
+ }
+
+ $parent->thumb_dirty = 1;
+ $parent->save();
+ graphics::generate($parent);
+ break;
case "delete":
$item = ORM::factory("item", $id);
$item->delete();
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f40f14e8..606320b1 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -1,6 +1,5 @@
/*
* @todo Trap resize of dialog and resize the child areas (tree, grid and edit form)
- * @todo Create a message area in the footer for all the organize messages
*/
var url;
var height;