[#2939] Add is_organization boolean to group model

ckan/logic/action/create.py

@@ -449,6 +449,7 @@ def _group_or_org_create(context, data_dict, is_org=False):
     user = context['user']
     session = context['session']
     parent = context.get('parent', None)
+    data_dict['is_organization'] = is_org
 
 
     # get the schema

ckan/logic/action/get.py

@@ -312,10 +312,7 @@ def _group_or_org_list(context, data_dict, is_org=False):
     if groups:
         query = query.filter(model.GroupRevision.name.in_(groups))
 
-    if is_org:
-        query = query.filter(model.GroupRevision.type=='organization')
-    else:
-        query = query.filter(model.GroupRevision.type!='organization')
+    query = query.filter(model.GroupRevision.is_organization==is_org)
 
     groups = query.all()
     group_list = model_dictize.group_list_dictize(groups, context,

ckan/logic/schema.py

@@ -214,6 +214,7 @@ def default_group_schema():
         'type': [ignore_missing, unicode],
         'state': [ignore_not_group_admin, ignore_missing],
         'created': [ignore],
+        'is_organization': [ignore_missing],
         'approval_status': [ignore_missing, unicode],
         'extras': default_extras_schema(),
         '__extras': [ignore],

ckan/migration/versions/061_org_changes.py

@@ -16,6 +16,13 @@ def upgrade(migrate_engine):
     ADD COLUMN owner_org TEXT,
     ADD COLUMN private boolean DEFAULT FALSE;
 
+
+ALTER TABLE "group"
+    ADD COLUMN is_organization boolean DEFAULT FALSE;
+
+ALTER TABLE group_revision
+    ADD COLUMN is_organization boolean DEFAULT FALSE;
+
 COMMIT;
 
 '''

ckan/model/group.py

@@ -43,6 +43,7 @@
                     Column('image_url', types.UnicodeText),
                     Column('created', types.DateTime,
                            default=datetime.datetime.now),
+                    Column('is_organization', types.Boolean, default=False),
                     Column('approval_status', types.UnicodeText,
                            default=u"approved"))