From cd907c2b42f8b50ebe6d490aab42365e16deb258 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 17 Jul 2009 12:51:27 -0700
Subject: Change model_cache::clear() API to clear everything.  This prevents
 old ORM relationships from hanging around, which was causing problems when
 doing MPTT manipulations (resulting in incorrect permission propagation--
 very bad!)

---
 modules/gallery/helpers/item.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index f40b5c97..80c25862 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -53,7 +53,7 @@ class item_Core {
     access::required("view", $parent);
     access::required("edit", $parent);
 
-    model_cache::clear("item", $parent->album_cover_item_id);
+    model_cache::clear();
     $parent->album_cover_item_id = $item->is_album() ? $item->album_cover_item_id : $item->id;
     $parent->thumb_dirty = 1;
     $parent->save();
@@ -69,7 +69,7 @@ class item_Core {
     access::required("edit", $album);
     @unlink($album->thumb_path());
 
-    model_cache::clear("item", $album->album_cover_item_id)  ;
+    model_cache::clear();
     $album->album_cover_item_id = null;
     $album->thumb_width = 0;
     $album->thumb_height = 0;
-- 
cgit v1.2.3


From 24d7f5df8c8a18b9ac017fb7b4fc92974b5435cc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 17 Aug 2009 23:47:39 +0800
Subject: Refactor the get maximum weight functionality into a method in the
 item helper, so that we can use it else where (i.e. the new organize module)

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/item.php | 14 ++++++++++++++
 modules/gallery/models/item.php  |  9 +--------
 2 files changed, 15 insertions(+), 8 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 80c25862..5504dc95 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -137,4 +137,18 @@ class item_Core {
     $group->submit("")->value(t("Delete"));
     return $form;
   }
+
+  /**
+   * Get the next weight value
+   */
+  static function get_max_weight() {
+    // Guard against an empty result when we create the first item.  It's unfortunate that we
+    // have to check this every time.
+    // @todo: figure out a better way to bootstrap the weight.
+    $result = Database::instance()
+      ->select("weight")->from("items")
+      ->orderby("weight", "desc")->limit(1)
+      ->get()->current();
+    return ($result ? $result->weight : 0) + 1;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c4b9826f..7a3a2ba7 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -351,14 +351,7 @@ class Item_Model extends ORM_MPTT {
       $this->updated = time();
       if (!$this->loaded) {
         $this->created = $this->updated;
-        // Guard against an empty result when we create the first item.  It's unfortunate that we
-        // have to check this every time.
-        // @todo: figure out a better way to bootstrap the weight.
-        $result = Database::instance()
-          ->select("weight")->from("items")
-          ->orderby("weight", "desc")->limit(1)
-          ->get()->current();
-        $this->weight = ($result ? $result->weight : 0) + 1;
+        $this->weight = item::get_max_weight();
       } else {
         $send_event = 1;
       }
-- 
cgit v1.2.3


From e3f5a8be903dd54a72b9c7694a21d63655999127 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 18 Aug 2009 23:40:52 +0800
Subject: Change the setting of page type from "item" to "photo".  Thre is no
 page type of item.  All other references use photo for non album and non
 dynamic pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 5504dc95..a2d3859f 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -129,7 +129,7 @@ class item_Core {
     if (Input::instance()->get("page_type") == "album") {
       $page_type = "album";
     } else {
-      $page_type = "item";
+      $page_type = "photo";
     }
     $form = new Forge("quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "gConfirmDelete"));
     $form->hidden("_method")->value("put");
-- 
cgit v1.2.3