[#2816] Re-add some items to model.__init__

Conflicts:
	ckan/model/__init__.py

    new stuff added in both trivial

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__)

ckan/model/domain_object.py

@@ -7,7 +7,7 @@
 import meta
 import core
 
-__all__ = ['DomainObject']
+__all__ = ['DomainObject', 'DomainObjectOperation']
 
 class Enum(set):
     '''Simple enumeration