(1)Add tag edit field in album/photo edit form. (2)provide edit functionality. (3)support multi-word tagging.

5 files changed, 11 insertions, 0 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9980b676..0e1c27e5 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -191,6 +191,8 @@ class Albums_Controller extends Items_Controller {
       }
       $album->save();
 
+      module::event("album_edit_form_completed", $album, $form);
+
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
         t("Saved album %album_title", array("album_title" => p::clean($album->title))));
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index d954ad8d..110ea620 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -90,6 +90,8 @@ class Movies_Controller extends Items_Controller {
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
+      module::event("photo_edit_form_completed", $photo, $form);
+
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9ce6ed23..5d37636d 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -83,6 +83,8 @@ class Photos_Controller extends Items_Controller {
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
+      module::event("photo_edit_form_completed", $photo, $form);
+
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index f1a6c060..63182c36 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -126,6 +126,9 @@ class album_Core {
       ->options(array("ASC" => t("Ascending"),
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
+
+    module::event("album_edit_form", $parent, $form);
+
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index ce964c14..bf38e1ee 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -147,6 +147,8 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
+    module::event("photo_edit_form", $photo, $form);
+
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
     return $form;