Merge branch 'bulk-publish-tasks'.
diff --git a/app/app.yaml.template b/app/app.yaml.template
index 8e59ac3..5d91413 100644
--- a/app/app.yaml.template
+++ b/app/app.yaml.template
@@ -15,7 +15,7 @@
 # TODO(proto): uncomment and supply a Google App Engine application instance
 # application: FIXME
 # TODO(release): see the instructions in README about the "version:" field
-version: 2-0-20121123
+version: 2-0-20121124
 runtime: python
 api_version: 1
 
diff --git a/app/soc/modules/gci/views/dashboard.py b/app/soc/modules/gci/views/dashboard.py
index 071bcc7..d2a458a 100644
--- a/app/soc/modules/gci/views/dashboard.py
+++ b/app/soc/modules/gci/views/dashboard.py
@@ -1130,7 +1130,11 @@
     self.data = data
     r = data.redirect
 
-    list_config = lists.ListConfiguration()
+    # GCIRequest entities have user entities as parents, so the keys
+    # for the list items should be parent scoped.
+    list_config = lists.ListConfiguration(add_key_column=False)
+    list_config.addColumn('key', 'Key', (lambda ent, *args: "%s/%s" % (
+        ent.parent().key().name(), ent.key().id())), hidden=True)
     list_config.addColumn('to', 'To',
         lambda entity, *args: entity.user.name)
     list_config.addSimpleColumn('status', 'Status')
@@ -1188,7 +1192,12 @@
     self.data = data
     r = data.redirect
 
-    list_config = lists.ListConfiguration()
+    # GCIRequest entities have user entities as parents, so the keys
+    # for the list items should be parent scoped.
+    list_config = lists.ListConfiguration(add_key_column=False)
+    list_config.addColumn('key', 'Key', (lambda ent, *args: "%s/%s" % (
+        ent.parent().key().name(), ent.key().id())), hidden=True)
+
     list_config.addColumn('from', 'From',
         lambda entity, *args: entity.user.name)
     list_config.addSimpleColumn('status', 'Status')
diff --git a/app/soc/modules/gci/views/org_home.py b/app/soc/modules/gci/views/org_home.py
index 7919775..5463568 100644
--- a/app/soc/modules/gci/views/org_home.py
+++ b/app/soc/modules/gci/views/org_home.py
@@ -225,11 +225,14 @@
         'page_name': '%s - Home page' % (self.data.organization.name),
         'about_us': AboutUs(self.data),
         'contact_us': ContactUs(self.data),
-        'open_tasks_list': OpenTasksList(self.request, self.data),
-        'completed_tasks_list': CompletedTasksList(self.request, self.data),
         'feed_url': self.data.organization.feed_url,
     }
 
+    if self.data.timeline.tasksPubliclyVisible():
+      context['open_tasks_list'] = OpenTasksList(self.request, self.data)
+      context['completed_tasks_list'] = CompletedTasksList(
+          self.request, self.data)
+
     if self.data.is_host or accounts.isDeveloper():
       context['host_actions'] = GCIHostActions(self.data)