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

Change the API for getting to the original state of an ORM.

Browse Source 
Old API:  $obj->original("field_name")
  New API:  $obj->original()->field_name

This allows us to revert the varous xxx_updated events back to passing
an original ORM as well as the the updated one.  This makes for a
cleaner event API.

  Old API:  comment_updated($comment) { $comment->original("field_name") }
  Old API:  comment_updated($old, $new) { $old->field_name }
This commit is contained in:
Bharat Mediratta
2009-08-02 12:09:00 -07:00
parent f034c6c534
commit 7ad0808a11
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/akismet/helpers/akismet_event.php
View File

@@ -40,14 +40,14 @@ class akismet_event_Core {
$comment->save();
}
static function comment_updated($comment) {
static function comment_updated($original, $new) {
if (!module::get_var("akismet", "api_key")) {
return;
}
if ($comment->original("state") != "spam" && $comment->state == "spam") {
if ($original->state != "spam" && $new->state == "spam") {
akismet::submit_spam($new);
} else if ($comment->original("state") == "spam" && $comment->state != "spam") {
} else if ($original->state == "spam" && $new->state != "spam") {
akismet::submit_ham($new);
}
}

8
modules/comment/models/comment.php
View File

@@ -64,17 +64,17 @@ class Comment_Model extends ORM {
$created = true;
}
}
$visible_change = $this->original()->state == "published" || $this->state == "published";
parent::save();
if (isset($created)) {
module::event("comment_created", $this);
} else {
module::event("comment_updated", $this);
module::event("comment_updated", $this->original(), $this);
}
// We only notify on the related items if we're making a visible change, which means moving in
// or out of a published state
if ($this->original("state") == "published" || $this->state == "published") {
// We only notify on the related items if we're making a visible change.
if ($visible_change) {
module::event("item_related_update", $this->item());
}

12
modules/gallery/libraries/MY_ORM.php
View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class ORM extends ORM_Core {
// Track the original value of this ORM instance so that we can look it up in ORM::original()
// Track the original value of this ORM so that we can look it up in ORM::original()
protected $original = null;
public function open_paren() {
@@ -34,13 +34,13 @@ class ORM extends ORM_Core {
public function save() {
model_cache::clear();
$result = parent::save();
$this->original = $this->object;
$this->original = clone $this;
return $result;
}
public function __set($column, $value) {
if (!isset($this->original)) {
$this->original = $this->object;
$this->original = clone $this;
}
return parent::__set($column, $value);
@@ -48,14 +48,14 @@ class ORM extends ORM_Core {
public function __unset($column) {
if (!isset($this->original)) {
$this->original = $this->object;
$this->original = clone $this;
}
return parent::__unset($column);
}
public function original($column) {
return $this->original[$column];
public function original() {
return $this->original;
}
}

2
modules/gallery/models/item.php
View File

@@ -365,7 +365,7 @@ class Item_Model extends ORM_MPTT {
}
parent::save();
if (isset($send_event)) {
module::event("item_updated", $this);
module::event("item_updated", $this->original(), $this);
}
return $this;
}

2
modules/gallery/tests/Item_Model_Test.php
View File

@@ -147,7 +147,7 @@ class Item_Model_Test extends Unit_Test_Case {
$item->save();
$item->title = "NEW_VALUE";
$this->assert_same("ORIGINAL_VALUE", $item->original("title"));
$this->assert_same("ORIGINAL_VALUE", $item->original()->title);
$this->assert_same("NEW_VALUE", $item->title);
}
}

8
modules/notification/helpers/notification_event.php
View File

@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class notification_event_Core {
static function item_updated($item) {
notification::send_item_updated($item);
static function item_updated($original, $new) {
notification::send_item_updated($new);
}
static function item_created($item) {
@@ -40,8 +40,8 @@ class notification_event_Core {
}
}
static function comment_updated($item) {
if ($item->state == "published" && $item->original("state") != "published") {
static function comment_updated($original, $new) {
if ($new->state == "published" && $original->state != "published") {
notification::send_comment_published($new);
}
}

4
modules/search/helpers/search_event.php
View File

@@ -22,8 +22,8 @@ class search_event_Core {
search::update($item);
}
static function item_updated($item) {
search::update($item);
static function item_updated($original, $new) {
search::update($new);
}
static function item_deleted($item) {

2
modules/user/models/group.php
View File

@@ -41,7 +41,7 @@ class Group_Model extends ORM {
if (isset($created)) {
module::event("group_created", $this);
} else {
module::event("group_updated", $this);
module::event("group_updated", $this->original(), $this);
}
return $this;
}

2
modules/user/models/user.php
View File

@@ -68,7 +68,7 @@ class User_Model extends ORM {
if (isset($created)) {
module::event("user_created", $this);
} else {
module::event("user_updated", $this);
module::event("user_updated", $this->original(), $this);
}
return $this;
}