From 7309f372ad31db46a67dc50b2b4b98f9c8f9f216 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 9 Aug 2012 08:09:40 +0100
Subject: [PATCH] [#2816] Re-add some items to model.__init__

Conflicts:
	ckan/model/__init__.py

    new stuff added in both trivial
---
 ckan/model/__init__.py      | 25 +++++++++++++++----------
 ckan/model/domain_object.py |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ckan/model/__init__.py b/ckan/model/__init__.py
index 8b62c3a1fae..8af69b5ad1f 100644
--- a/ckan/model/__init__.py
+++ b/ckan/model/__init__.py
@@ -81,13 +81,13 @@
     member_revision_table,
     group_table,
     GroupRevision,
-    #MemberRevision,
-    #member_table,
+    MemberRevision,
+    member_table,
 )
 from group_extra import (
     GroupExtra,
-    #group_extra_table,
-    #GroupExtraRevision,
+    group_extra_table,
+    GroupExtraRevision,
 )
 from package_extra import (
     PackageExtra,
@@ -99,12 +99,12 @@
     Resource,
     ResourceGroup,
     ResourceRevision,
-    #DictProxy,
+    DictProxy,
     resource_group_table,
     resource_table,
     resource_revision_table,
-    #ResourceGroupRevision,
-    #resource_group_revision_table,
+    ResourceGroupRevision,
+    resource_group_revision_table,
 )
 from tracking import (
     tracking_summary_table,
@@ -126,7 +126,7 @@
 )
 from task_status import (
     TaskStatus,
-    #task_status_table,
+    task_status_table,
 )
 from vocabulary import (
     Vocabulary,
@@ -136,8 +136,8 @@
 from activity import (
     Activity,
     ActivityDetail,
-    #activity_table,
-    #activity_detail_table,
+    activity_table,
+    activity_detail_table,
 )
 from term_translation import (
     term_translation_table,
@@ -155,6 +155,11 @@
     delete_system_info,
 )
 
+from domain_object import (
+    DomainObjectOperation,
+    DomainObject,
+)
+
 import ckan.migration
 
 log = logging.getLogger(__name__)
diff --git a/ckan/model/domain_object.py b/ckan/model/domain_object.py
index ae47d81341a..4237d77aea7 100644
--- a/ckan/model/domain_object.py
+++ b/ckan/model/domain_object.py
@@ -7,7 +7,7 @@
 import meta
 import core
 
-__all__ = ['DomainObject']
+__all__ = ['DomainObject', 'DomainObjectOperation']
 
 class Enum(set):
     '''Simple enumeration