From a432a43b3b39fbec70d4cece1eb0ba5625b2679c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 15 Jun 2010 17:18:22 -0700
Subject: Revert "Change the item rest update processing to call the
 item::move(source, target) helper when the parent member has changed. Using
 the move method insures that names and slugs that could conflict in the
 target album are resolved properly.  Changed the item::move method so it
 returns a message to be displayed if the caller chooses. And changed the move
 controller to display the message returned by the move if the item name was
 renamed as part of the move."

Rolling this back for a couple of reasons:

1) Bug in move.php ("message.info" is not a function name)

2) Having the message come back from the API call as a side-effect is
sloppy.  We should find a cleaner way to do this checking.

3) having item::move() call save() on any changed values in the ORM
is counter-intuitive.  Move should move, save should save.

I think the right approach here is to roll the move() code properly into
save().

This reverts commit 2492280cc0ec9eb64a8daeccc7b5698ece7fea66.
---
 modules/gallery/helpers/item.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'modules/gallery/helpers/item.php')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 6a740de4..15bbe977 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -47,28 +47,27 @@ class item_Core {
     $orig_name_filename = pathinfo($source->name, PATHINFO_FILENAME);
     $orig_name_extension = pathinfo($source->name, PATHINFO_EXTENSION);
     $orig_slug = $source->slug;
-    $message = "";
     for ($i = 0; $i < 5; $i++) {
       try {
         $source->save();
         if ($orig_name != $source->name) {
           switch ($source->type) {
           case "album":
-            $message =
+            message::info(
               t("Album <b>%old_name</b> renamed to <b>%new_name</b> to avoid a conflict",
-                array("old_name" => $orig_name, "new_name" => $source->name));
+                array("old_name" => $orig_name, "new_name" => $source->name)));
             break;
 
           case "photo":
-            $message =
+            message::info(
               t("Photo <b>%old_name</b> renamed to <b>%new_name</b> to avoid a conflict",
-                array("old_name" => $orig_name, "new_name" => $source->name));
+                array("old_name" => $orig_name, "new_name" => $source->name)));
             break;
 
           case "movie":
-            $message =
+            message::info(
               t("Movie <b>%old_name</b> renamed to <b>%new_name</b> to avoid a conflict",
-                array("old_name" => $orig_name, "new_name" => $source->name));
+                array("old_name" => $orig_name, "new_name" => $source->name)));
             break;
           }
         }
@@ -96,8 +95,6 @@ class item_Core {
     if ($target->album_cover_item_id == null)  {
       item::make_album_cover($source);
     }
-
-    return $message;
   }
 
   static function make_album_cover($item) {
-- 
cgit v1.2.3