MERGE conflicts

ckan/migration/versions/075_add_closed_to_group.py

@@ -0,0 +1,35 @@
+import ckan.model
+
+
+def upgrade(migrate_engine):
+    migrate_engine.execute(
+        '''
+        ALTER TABLE "group"
+            ADD COLUMN "closed" BOOLEAN DEFAULT FALSE;
+        UPDATE "group" set closed=false;
+        ALTER TABLE "group_revision"
+            ADD COLUMN "closed" BOOLEAN DEFAULT FALSE;
+        UPDATE "group_revision" set closed=false;
+
+        ALTER TABLE "group"
+            ADD COLUMN "closed_date" timestamp without time zone;
+        UPDATE "group" set closed_date=NULL;
+        ALTER TABLE "group_revision"
+            ADD COLUMN "closed_date" timestamp without time zone;
+        UPDATE "group_revision" set closed_date=NULL;
+
+        ALTER TABLE "group"
+            ADD COLUMN "related_group_id" TEXT;
+        UPDATE "group" set related_group_id=NULL;
+        ALTER TABLE "group_revision"
+            ADD COLUMN "related_group_id" TEXT;
+        UPDATE "group_revision" set related_group_id=NULL;
+
+        ALTER TABLE "group"
+            ADD COLUMN "related_group_relationship" TEXT;
+        UPDATE "group" set related_group_relationship=NULL;
+        ALTER TABLE "group_revision"
+            ADD COLUMN "related_group_relationship" TEXT;
+        UPDATE "group_revision" set related_group_relationship=NULL;
+        '''
+    )

ckan/templates/snippets/organization.html

@@ -32,7 +32,7 @@ <h2 class="module-heading"><i class="icon-building"></i> {{ _('Organization') }}
         </div>
       {% endblock %}
       {% block heading %}
-      <h1 class="heading">{{ display_name }}
+      <h1 class="heading">{{ organization.display_name }}
         {% if organization.state == 'deleted' %}
           [{{ _('Deleted') }}]
         {% endif %}