From fd0eca05a2b7fd5a172bf79d2dd483d1663c6c03 Mon Sep 17 00:00:00 2001
From: Chris Ruppel <chris.ruppel@gmail.com>
Date: Mon, 8 Aug 2011 15:41:35 -0500
Subject: [PATCH 1/5] 1150334: recreating sessions View in D7

---
 cod_session/cod_session.features.inc      |   10 +
 cod_session/cod_session.info              |    3 +
 cod_session/cod_session.views_default.inc |  419 +++++++++++++++++++++++++++++
 3 files changed, 432 insertions(+), 0 deletions(-)
 create mode 100644 cod_session/cod_session.views_default.inc

diff --git a/cod_session/cod_session.features.inc b/cod_session/cod_session.features.inc
index 7d19db7..4f4f611 100644
--- a/cod_session/cod_session.features.inc
+++ b/cod_session/cod_session.features.inc
@@ -19,6 +19,16 @@ function cod_session_ctools_plugin_api() {
 }
 
 /**
+ * Implementation of hook_views_api().
+ */
+function cod_session_views_api() {
+  list($module, $api) = func_get_args();
+  if ($module == "views" && $api == "views_default") {
+    return array("version" => "3.0");
+  }
+}
+
+/**
  * Implementation of hook_node_info().
  */
 function cod_session_node_info() {
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index 8744ccd..e64374f 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -9,9 +9,11 @@ dependencies[] = "list"
 dependencies[] = "node_reference"
 dependencies[] = "strongarm"
 dependencies[] = "user_reference"
+dependencies[] = "views"
 description = "COD Session Scheduling & Voting"
 features[ctools][] = "field_group:field_group:1"
 features[ctools][] = "strongarm:strongarm:1"
+features[ctools][] = "views:views_default:3.0"
 features[field][] = "node-room-body"
 features[field][] = "node-room-field_room_capacity"
 features[field][] = "node-room-field_room_photo"
@@ -82,6 +84,7 @@ features[variable][] = "node_options_room"
 features[variable][] = "node_options_schedule_item"
 features[variable][] = "node_options_session"
 features[variable][] = "node_options_time_slot"
+features[views_view][] = "sessions"
 name = "COD Session"
 package = "COD"
 php = "5.2.4"
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
new file mode 100644
index 0000000..38532fc
--- /dev/null
+++ b/cod_session/cod_session.views_default.inc
@@ -0,0 +1,419 @@
+<?php
+/**
+ * @file
+ * cod_session.views_default.inc
+ */
+
+/**
+ * Implementation of hook_views_default_views().
+ */
+function cod_session_views_default_views() {
+  $export = array();
+
+  $view = new view;
+  $view->name = 'sessions';
+  $view->description = '';
+  $view->tag = 'default';
+  $view->base_table = 'node';
+  $view->human_name = 'sessions';
+  $view->core = 7;
+  $view->api_version = '3.0-alpha1';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Master */
+  $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['title'] = 'Proposed Sessions';
+  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['query']['options']['query_comment'] = FALSE;
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '20';
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'title' => 'title',
+    'field_speakers' => 'field_speakers',
+    'body' => 'body',
+    'field_accepted' => 'field_accepted',
+    'field_experience' => 'field_experience',
+    'field_track' => 'field_track',
+  );
+  $handler->display->display_options['style_options']['default'] = '-1';
+  $handler->display->display_options['style_options']['info'] = array(
+    'title' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_speakers' => array(
+      'align' => '',
+      'separator' => '',
+    ),
+    'body' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_accepted' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_experience' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_track' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+  );
+  $handler->display->display_options['style_options']['override'] = 1;
+  $handler->display->display_options['style_options']['sticky'] = 1;
+  $handler->display->display_options['style_options']['empty_table'] = 0;
+  /* No results behavior: Global: Text area */
+  $handler->display->display_options['empty']['area']['id'] = 'area';
+  $handler->display->display_options['empty']['area']['table'] = 'views';
+  $handler->display->display_options['empty']['area']['field'] = 'area';
+  $handler->display->display_options['empty']['area']['label'] = 'No sessions...';
+  $handler->display->display_options['empty']['area']['empty'] = FALSE;
+  $handler->display->display_options['empty']['area']['content'] = 'No sessions have been submitted.';
+  $handler->display->display_options['empty']['area']['format'] = 'plain_text';
+  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  /* Field: Content: Title */
+  $handler->display->display_options['fields']['title']['id'] = 'title';
+  $handler->display->display_options['fields']['title']['table'] = 'node';
+  $handler->display->display_options['fields']['title']['field'] = 'title';
+  $handler->display->display_options['fields']['title']['label'] = 'Session';
+  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['title']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['title']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['title']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['title']['link_to_node'] = 1;
+  /* Field: Content: Speaker(s) */
+  $handler->display->display_options['fields']['field_speakers']['id'] = 'field_speakers';
+  $handler->display->display_options['fields']['field_speakers']['table'] = 'field_data_field_speakers';
+  $handler->display->display_options['fields']['field_speakers']['field'] = 'field_speakers';
+  $handler->display->display_options['fields']['field_speakers']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['group_rows'] = 1;
+  $handler->display->display_options['fields']['field_speakers']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_speakers']['delta_reversed'] = 0;
+  $handler->display->display_options['fields']['field_speakers']['field_api_classes'] = 0;
+  /* Field: Content: Body */
+  $handler->display->display_options['fields']['body']['id'] = 'body';
+  $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
+  $handler->display->display_options['fields']['body']['field'] = 'body';
+  $handler->display->display_options['fields']['body']['label'] = '';
+  $handler->display->display_options['fields']['body']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['max_length'] = '200';
+  $handler->display->display_options['fields']['body']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['body']['alter']['trim'] = 1;
+  $handler->display->display_options['fields']['body']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['body']['element_label_colon'] = FALSE;
+  $handler->display->display_options['fields']['body']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['body']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['body']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['body']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
+  $handler->display->display_options['fields']['body']['settings'] = array(
+    'trim_length' => '250',
+  );
+  $handler->display->display_options['fields']['body']['field_api_classes'] = 0;
+  /* Field: Content: Status */
+  $handler->display->display_options['fields']['field_accepted']['id'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['field'] = 'field_accepted';
+  $handler->display->display_options['fields']['field_accepted']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['field_accepted']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_accepted']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_accepted']['field_api_classes'] = 0;
+  /* Field: Content: Experience level */
+  $handler->display->display_options['fields']['field_experience']['id'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['fields']['field_experience']['field'] = 'field_experience';
+  $handler->display->display_options['fields']['field_experience']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_experience']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_experience']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_experience']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_experience']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_experience']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_experience']['field_api_classes'] = 0;
+  /* Field: Content: Track */
+  $handler->display->display_options['fields']['field_track']['id'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['table'] = 'field_data_field_track';
+  $handler->display->display_options['fields']['field_track']['field'] = 'field_track';
+  $handler->display->display_options['fields']['field_track']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_track']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_track']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_label_colon'] = 0;
+  $handler->display->display_options['fields']['field_track']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_track']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_track']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_track']['field_api_classes'] = 0;
+  /* Sort criterion: Content: Title */
+  $handler->display->display_options['sorts']['title']['id'] = 'title';
+  $handler->display->display_options['sorts']['title']['table'] = 'node';
+  $handler->display->display_options['sorts']['title']['field'] = 'title';
+  $handler->display->display_options['sorts']['title']['exposed'] = TRUE;
+  $handler->display->display_options['sorts']['title']['expose']['label'] = 'Title';
+  /* Contextual filter: Content: Experience level (field_experience) */
+  $handler->display->display_options['arguments']['field_experience_value']['id'] = 'field_experience_value';
+  $handler->display->display_options['arguments']['field_experience_value']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['arguments']['field_experience_value']['field'] = 'field_experience_value';
+  $handler->display->display_options['arguments']['field_experience_value']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_experience_value']['default_argument_skip_url'] = 0;
+  $handler->display->display_options['arguments']['field_experience_value']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_experience_value']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_experience_value']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_experience_value']['glossary'] = 0;
+  $handler->display->display_options['arguments']['field_experience_value']['limit'] = '0';
+  $handler->display->display_options['arguments']['field_experience_value']['transform_dash'] = 0;
+  $handler->display->display_options['arguments']['field_experience_value']['break_phrase'] = 0;
+  /* Contextual filter: Content: Track (field_track) */
+  $handler->display->display_options['arguments']['field_track_value']['id'] = 'field_track_value';
+  $handler->display->display_options['arguments']['field_track_value']['table'] = 'field_data_field_track';
+  $handler->display->display_options['arguments']['field_track_value']['field'] = 'field_track_value';
+  $handler->display->display_options['arguments']['field_track_value']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_track_value']['default_argument_skip_url'] = 0;
+  $handler->display->display_options['arguments']['field_track_value']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_track_value']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_track_value']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_track_value']['glossary'] = 0;
+  $handler->display->display_options['arguments']['field_track_value']['limit'] = '0';
+  $handler->display->display_options['arguments']['field_track_value']['transform_dash'] = 0;
+  $handler->display->display_options['arguments']['field_track_value']['break_phrase'] = 0;
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'session' => 'session',
+  );
+  /* Filter criterion: Content: Experience level (field_experience) */
+  $handler->display->display_options['filters']['field_experience_value']['id'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['filters']['field_experience_value']['field'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator_id'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Content: Track (field_track) */
+  $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
+  $handler->display->display_options['filters']['field_track_value']['field'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator_id'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['label'] = 'Track';
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['identifier'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Search: Search Terms */
+  $handler->display->display_options['filters']['keys']['id'] = 'keys';
+  $handler->display->display_options['filters']['keys']['table'] = 'search_index';
+  $handler->display->display_options['filters']['keys']['field'] = 'keys';
+  $handler->display->display_options['filters']['keys']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['keys']['expose']['operator_id'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['label'] = 'Filter by keywords';
+  $handler->display->display_options['filters']['keys']['expose']['operator'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
+  $handler->display->display_options['filters']['keys']['expose']['multiple'] = FALSE;
+  /* Filter criterion: Content: Status (field_accepted) */
+  $handler->display->display_options['filters']['field_accepted_value']['id'] = 'field_accepted_value';
+  $handler->display->display_options['filters']['field_accepted_value']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['filters']['field_accepted_value']['field'] = 'field_accepted_value';
+  $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
+    1 => '1',
+  );
+
+  /* Display: Page: Proposed */
+  $handler = $view->new_display('page', 'Page: Proposed', 'page_proposed');
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'session' => 'session',
+  );
+  /* Filter criterion: Content: Status (field_accepted) */
+  $handler->display->display_options['filters']['field_accepted_value']['id'] = 'field_accepted_value';
+  $handler->display->display_options['filters']['field_accepted_value']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['filters']['field_accepted_value']['field'] = 'field_accepted_value';
+  $handler->display->display_options['filters']['field_accepted_value']['operator'] = 'empty';
+  $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
+    'all' => 'all',
+    1 => '1',
+    2 => '2',
+  );
+  $handler->display->display_options['path'] = 'program/sessions/proposed';
+
+  /* Display: Page: Accepted */
+  $handler = $view->new_display('page', 'Page: Accepted', 'page_1');
+  $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['title'] = 'Accepted Sessions';
+  $handler->display->display_options['defaults']['style_plugin'] = FALSE;
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'title' => 'title',
+    'field_speakers' => 'field_speakers',
+    'body' => 'body',
+    'field_accepted' => 'field_accepted',
+    'field_experience' => 'field_experience',
+    'field_track' => 'field_track',
+  );
+  $handler->display->display_options['style_options']['default'] = 'title';
+  $handler->display->display_options['style_options']['info'] = array(
+    'title' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_speakers' => array(
+      'align' => '',
+      'separator' => '',
+    ),
+    'body' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_accepted' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_experience' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_track' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+  );
+  $handler->display->display_options['style_options']['override'] = 1;
+  $handler->display->display_options['style_options']['sticky'] = 1;
+  $handler->display->display_options['style_options']['empty_table'] = 0;
+  $handler->display->display_options['defaults']['style_options'] = FALSE;
+  $handler->display->display_options['defaults']['row_plugin'] = FALSE;
+  $handler->display->display_options['defaults']['row_options'] = FALSE;
+  $handler->display->display_options['defaults']['empty'] = FALSE;
+  /* No results behavior: Global: Text area */
+  $handler->display->display_options['empty']['area']['id'] = 'area';
+  $handler->display->display_options['empty']['area']['table'] = 'views';
+  $handler->display->display_options['empty']['area']['field'] = 'area';
+  $handler->display->display_options['empty']['area']['label'] = 'No sessions...';
+  $handler->display->display_options['empty']['area']['empty'] = FALSE;
+  $handler->display->display_options['empty']['area']['content'] = 'No sessions have been accepted yet.';
+  $handler->display->display_options['empty']['area']['format'] = 'plain_text';
+  $handler->display->display_options['empty']['area']['tokenize'] = 0;
+  $handler->display->display_options['defaults']['sorts'] = FALSE;
+  $handler->display->display_options['path'] = 'program/sessions/accepted';
+  $export['sessions'] = $view;
+
+  return $export;
+}
-- 
1.7.3.4


From fcb65512e8b27088a2bd7b27fa73759bec269e12 Mon Sep 17 00:00:00 2001
From: coltrane <coltrane@91990.no-reply.drupal.org>
Date: Wed, 17 Aug 2011 13:57:16 -0500
Subject: [PATCH 2/5] Issue 1150334: Added Speaker prepopulation form_alter

---
 cod_session/cod_session.module |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/cod_session/cod_session.module b/cod_session/cod_session.module
index 272de88..7171f9e 100644
--- a/cod_session/cod_session.module
+++ b/cod_session/cod_session.module
@@ -5,3 +5,23 @@
  */
 
 include_once('cod_session.features.inc');
+
+/**
+ * Implementation of hook_form_alter().
+ */
+function cod_session_form_alter(&$form, &$form_state, $form_id) {
+  // Prepopulate the current user into the Speakers field
+  // on new session creation.
+  if ($form_id == 'session_node_form') {
+    if (isset($form['field_speakers'])) {
+      // Form tweaks for the Speakers field:
+      $form['field_speakers']['field_speakers_add_more']['#value'] = t('Add another speaker');
+      // Prepopulate the current user into the Speakers field
+      // on new session creation.
+      if (empty($form['#node']->nid)) {
+        global $user;
+        $form['field_speakers'][LANGUAGE_NONE][0]['uid']['#default_value'] = $user->uid;
+      }
+    }
+  }
+}
\ No newline at end of file
-- 
1.7.3.4


From 6ff553f44e1b54cf4d92437efa73c0a548ddc7c1 Mon Sep 17 00:00:00 2001
From: Chris Ruppel <chris.ruppel@gmail.com>
Date: Wed, 17 Aug 2011 14:31:31 -0500
Subject: [PATCH 3/5] Issue 1150334: added 'page:accepted' and 'feed:all' displays

---
 cod_session/cod_session.features.field.inc         |   43 +++++--
 .../cod_session.features.user_permission.inc       |   94 ++++++++-----
 cod_session/cod_session.info                       |    2 -
 cod_session/cod_session.views_default.inc          |  146 ++++++++++++++++----
 4 files changed, 207 insertions(+), 78 deletions(-)

diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index 2b6bead..eeb6c1a 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -34,7 +34,15 @@ function cod_session_field_default_fields() {
         ),
       ),
       'module' => 'text',
-      'settings' => array(),
+      'settings' => array(
+        'field_permissions' => array(
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
+          'view' => 'view',
+          'view own' => 0,
+        ),
+      ),
       'translatable' => '1',
       'type' => 'text_with_summary',
     ),
@@ -254,7 +262,15 @@ function cod_session_field_default_fields() {
         ),
       ),
       'module' => 'text',
-      'settings' => array(),
+      'settings' => array(
+        'field_permissions' => array(
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
+          'view' => 'view',
+          'view own' => 0,
+        ),
+      ),
       'translatable' => '1',
       'type' => 'text_with_summary',
     ),
@@ -396,7 +412,15 @@ function cod_session_field_default_fields() {
         ),
       ),
       'module' => 'text',
-      'settings' => array(),
+      'settings' => array(
+        'field_permissions' => array(
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
+          'view' => 'view',
+          'view own' => 0,
+        ),
+      ),
       'translatable' => '1',
       'type' => 'text_with_summary',
     ),
@@ -775,9 +799,9 @@ function cod_session_field_default_fields() {
         'display_default' => 1,
         'display_field' => 1,
         'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
           'view' => 'view',
           'view own' => 0,
         ),
@@ -852,9 +876,9 @@ function cod_session_field_default_fields() {
       'module' => 'user_reference',
       'settings' => array(
         'field_permissions' => array(
-          'create' => 0,
-          'edit' => 'edit',
-          'edit own' => 0,
+          'create' => 'create',
+          'edit' => 0,
+          'edit own' => 'edit own',
           'view' => 'view',
           'view own' => 0,
         ),
@@ -862,6 +886,7 @@ function cod_session_field_default_fields() {
           2 => 0,
           3 => 0,
           4 => 0,
+          5 => 0,
         ),
         'referenceable_status' => array(
           0 => 0,
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index dfc0257..c8eb8a5 100644
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -14,8 +14,9 @@ function cod_session_user_default_permissions() {
   $permissions['edit field_accepted'] = array(
     'name' => 'edit field_accepted',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -23,43 +24,44 @@ function cod_session_user_default_permissions() {
   // Exported permission: edit field_experience
   $permissions['edit field_experience'] = array(
     'name' => 'edit field_experience',
-    'roles' => array(),
+    'roles' => array(
+      0 => 'administrator',
+      1 => 'authenticated user',
+      2 => 'session organizer',
+      3 => 'site administrator',
+    ),
+    'module' => 'field_permissions',
   );
 
   // Exported permission: edit field_session_room
   $permissions['edit field_session_room'] = array(
     'name' => 'edit field_session_room',
-    'roles' => array(),
+    'roles' => array(
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
+    ),
+    'module' => 'field_permissions',
   );
 
   // Exported permission: edit field_session_slot
   $permissions['edit field_session_slot'] = array(
     'name' => 'edit field_session_slot',
-    'roles' => array(),
-  );
-
-  // Exported permission: edit field_slides
-  $permissions['edit field_slides'] = array(
-    'name' => 'edit field_slides',
-    'roles' => array(),
-  );
-
-  // Exported permission: edit field_slot_datetime
-  $permissions['edit field_slot_datetime'] = array(
-    'name' => 'edit field_slot_datetime',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
 
-  // Exported permission: edit field_speakers
-  $permissions['edit field_speakers'] = array(
-    'name' => 'edit field_speakers',
+  // Exported permission: edit field_slot_datetime
+  $permissions['edit field_slot_datetime'] = array(
+    'name' => 'edit field_slot_datetime',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -68,8 +70,9 @@ function cod_session_user_default_permissions() {
   $permissions['edit field_track'] = array(
     'name' => 'edit field_track',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -78,8 +81,9 @@ function cod_session_user_default_permissions() {
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -87,15 +91,20 @@ function cod_session_user_default_permissions() {
   // Exported permission: view field_experience
   $permissions['view field_experience'] = array(
     'name' => 'view field_experience',
-    'roles' => array(),
+    'roles' => array(
+      0 => 'administrator',
+      1 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
   );
 
   // Exported permission: view field_session_room
   $permissions['view field_session_room'] = array(
     'name' => 'view field_session_room',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'administrator',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -104,8 +113,9 @@ function cod_session_user_default_permissions() {
   $permissions['view field_session_slot'] = array(
     'name' => 'view field_session_slot',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'authenticated user',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -113,15 +123,19 @@ function cod_session_user_default_permissions() {
   // Exported permission: view field_slides
   $permissions['view field_slides'] = array(
     'name' => 'view field_slides',
-    'roles' => array(),
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
   );
 
   // Exported permission: view field_slot_datetime
   $permissions['view field_slot_datetime'] = array(
     'name' => 'view field_slot_datetime',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'authenticated user',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -129,15 +143,19 @@ function cod_session_user_default_permissions() {
   // Exported permission: view field_speakers
   $permissions['view field_speakers'] = array(
     'name' => 'view field_speakers',
-    'roles' => array(),
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
   );
 
   // Exported permission: view field_track
   $permissions['view field_track'] = array(
     'name' => 'view field_track',
     'roles' => array(
-      0 => 'session organizer',
-      1 => 'site administrator',
+      0 => 'authenticated user',
+      1 => 'session organizer',
+      2 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index e64374f..a8f7e4f 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -39,9 +39,7 @@ features[user_permission][] = "edit field_accepted"
 features[user_permission][] = "edit field_experience"
 features[user_permission][] = "edit field_session_room"
 features[user_permission][] = "edit field_session_slot"
-features[user_permission][] = "edit field_slides"
 features[user_permission][] = "edit field_slot_datetime"
-features[user_permission][] = "edit field_speakers"
 features[user_permission][] = "edit field_track"
 features[user_permission][] = "view field_accepted"
 features[user_permission][] = "view field_experience"
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index 38532fc..edcd717 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -237,32 +237,6 @@ function cod_session_views_default_views() {
   $handler->display->display_options['sorts']['title']['field'] = 'title';
   $handler->display->display_options['sorts']['title']['exposed'] = TRUE;
   $handler->display->display_options['sorts']['title']['expose']['label'] = 'Title';
-  /* Contextual filter: Content: Experience level (field_experience) */
-  $handler->display->display_options['arguments']['field_experience_value']['id'] = 'field_experience_value';
-  $handler->display->display_options['arguments']['field_experience_value']['table'] = 'field_data_field_experience';
-  $handler->display->display_options['arguments']['field_experience_value']['field'] = 'field_experience_value';
-  $handler->display->display_options['arguments']['field_experience_value']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['field_experience_value']['default_argument_skip_url'] = 0;
-  $handler->display->display_options['arguments']['field_experience_value']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['field_experience_value']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['field_experience_value']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_experience_value']['glossary'] = 0;
-  $handler->display->display_options['arguments']['field_experience_value']['limit'] = '0';
-  $handler->display->display_options['arguments']['field_experience_value']['transform_dash'] = 0;
-  $handler->display->display_options['arguments']['field_experience_value']['break_phrase'] = 0;
-  /* Contextual filter: Content: Track (field_track) */
-  $handler->display->display_options['arguments']['field_track_value']['id'] = 'field_track_value';
-  $handler->display->display_options['arguments']['field_track_value']['table'] = 'field_data_field_track';
-  $handler->display->display_options['arguments']['field_track_value']['field'] = 'field_track_value';
-  $handler->display->display_options['arguments']['field_track_value']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['field_track_value']['default_argument_skip_url'] = 0;
-  $handler->display->display_options['arguments']['field_track_value']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['field_track_value']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['field_track_value']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['field_track_value']['glossary'] = 0;
-  $handler->display->display_options['arguments']['field_track_value']['limit'] = '0';
-  $handler->display->display_options['arguments']['field_track_value']['transform_dash'] = 0;
-  $handler->display->display_options['arguments']['field_track_value']['break_phrase'] = 0;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -317,6 +291,10 @@ function cod_session_views_default_views() {
 
   /* Display: Page: Proposed */
   $handler = $view->new_display('page', 'Page: Proposed', 'page_proposed');
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    0 => 'AND',
+    1 => 'OR',
+  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -332,17 +310,59 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'session' => 'session',
   );
+  $handler->display->display_options['filters']['type']['group'] = 0;
+  /* Filter criterion: Content: Experience level (field_experience) */
+  $handler->display->display_options['filters']['field_experience_value']['id'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['filters']['field_experience_value']['field'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['group'] = 0;
+  $handler->display->display_options['filters']['field_experience_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator_id'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience level';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Content: Track (field_track) */
+  $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
+  $handler->display->display_options['filters']['field_track_value']['field'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['group'] = 0;
+  $handler->display->display_options['filters']['field_track_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator_id'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['label'] = 'Track';
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['identifier'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Search: Search Terms */
+  $handler->display->display_options['filters']['keys']['id'] = 'keys';
+  $handler->display->display_options['filters']['keys']['table'] = 'search_index';
+  $handler->display->display_options['filters']['keys']['field'] = 'keys';
+  $handler->display->display_options['filters']['keys']['group'] = 0;
+  $handler->display->display_options['filters']['keys']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['keys']['expose']['operator_id'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['label'] = 'Filter by keywords:';
+  $handler->display->display_options['filters']['keys']['expose']['operator'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
+  $handler->display->display_options['filters']['keys']['expose']['multiple'] = FALSE;
   /* Filter criterion: Content: Status (field_accepted) */
   $handler->display->display_options['filters']['field_accepted_value']['id'] = 'field_accepted_value';
   $handler->display->display_options['filters']['field_accepted_value']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['filters']['field_accepted_value']['field'] = 'field_accepted_value';
-  $handler->display->display_options['filters']['field_accepted_value']['operator'] = 'empty';
+  $handler->display->display_options['filters']['field_accepted_value']['operator'] = 'not in';
   $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
-    'all' => 'all',
     1 => '1',
-    2 => '2',
   );
+  $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
+  /* Filter criterion: Content: Status (field_accepted) */
+  $handler->display->display_options['filters']['field_accepted_value_1']['id'] = 'field_accepted_value_1';
+  $handler->display->display_options['filters']['field_accepted_value_1']['table'] = 'field_data_field_accepted';
+  $handler->display->display_options['filters']['field_accepted_value_1']['field'] = 'field_accepted_value';
+  $handler->display->display_options['filters']['field_accepted_value_1']['operator'] = 'empty';
+  $handler->display->display_options['filters']['field_accepted_value_1']['group'] = 1;
   $handler->display->display_options['path'] = 'program/sessions/proposed';
+  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'Proposed Sessions';
+  $handler->display->display_options['menu']['weight'] = '0';
 
   /* Display: Page: Accepted */
   $handler = $view->new_display('page', 'Page: Accepted', 'page_1');
@@ -413,6 +433,74 @@ function cod_session_views_default_views() {
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
   $handler->display->display_options['defaults']['sorts'] = FALSE;
   $handler->display->display_options['path'] = 'program/sessions/accepted';
+  $handler->display->display_options['menu']['type'] = 'default tab';
+  $handler->display->display_options['menu']['title'] = 'Accepted Sessions';
+  $handler->display->display_options['menu']['weight'] = '0';
+  $handler->display->display_options['tab_options']['type'] = 'normal';
+  $handler->display->display_options['tab_options']['title'] = 'Sessions';
+  $handler->display->display_options['tab_options']['weight'] = '0';
+  $handler->display->display_options['tab_options']['name'] = 'main-menu';
+
+  /* Display: Feed: All */
+  $handler = $view->new_display('feed', 'Feed: All', 'feed_1');
+  $handler->display->display_options['defaults']['link_display'] = FALSE;
+  $handler->display->display_options['link_display'] = 'page_proposed';
+  $handler->display->display_options['pager']['type'] = 'some';
+  $handler->display->display_options['style_plugin'] = 'rss';
+  $handler->display->display_options['row_plugin'] = 'node_rss';
+  $handler->display->display_options['defaults']['sorts'] = FALSE;
+  $handler->display->display_options['defaults']['arguments'] = FALSE;
+  $handler->display->display_options['defaults']['filters'] = FALSE;
+  /* Filter criterion: Content: Published */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'node';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 1;
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: Content: Type */
+  $handler->display->display_options['filters']['type']['id'] = 'type';
+  $handler->display->display_options['filters']['type']['table'] = 'node';
+  $handler->display->display_options['filters']['type']['field'] = 'type';
+  $handler->display->display_options['filters']['type']['value'] = array(
+    'session' => 'session',
+  );
+  /* Filter criterion: Content: Experience level (field_experience) */
+  $handler->display->display_options['filters']['field_experience_value']['id'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['table'] = 'field_data_field_experience';
+  $handler->display->display_options['filters']['field_experience_value']['field'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator_id'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['label'] = 'Experience';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['operator'] = 'field_experience_value_op';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['identifier'] = 'field_experience_value';
+  $handler->display->display_options['filters']['field_experience_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Content: Track (field_track) */
+  $handler->display->display_options['filters']['field_track_value']['id'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['table'] = 'field_data_field_track';
+  $handler->display->display_options['filters']['field_track_value']['field'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator_id'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['label'] = 'Track';
+  $handler->display->display_options['filters']['field_track_value']['expose']['operator'] = 'field_track_value_op';
+  $handler->display->display_options['filters']['field_track_value']['expose']['identifier'] = 'field_track_value';
+  $handler->display->display_options['filters']['field_track_value']['expose']['reduce'] = 0;
+  /* Filter criterion: Search: Search Terms */
+  $handler->display->display_options['filters']['keys']['id'] = 'keys';
+  $handler->display->display_options['filters']['keys']['table'] = 'search_index';
+  $handler->display->display_options['filters']['keys']['field'] = 'keys';
+  $handler->display->display_options['filters']['keys']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['keys']['expose']['operator_id'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['label'] = 'Filter by keywords';
+  $handler->display->display_options['filters']['keys']['expose']['operator'] = 'keys_op';
+  $handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
+  $handler->display->display_options['filters']['keys']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['path'] = 'program/sessions/proposed/rss';
+  $handler->display->display_options['displays'] = array(
+    'page_proposed' => 'page_proposed',
+    'default' => 0,
+    'page_1' => 0,
+  );
   $export['sessions'] = $view;
 
   return $export;
-- 
1.7.3.4


From 63749ad06443b7df5e3ec2a080f568a824f66872 Mon Sep 17 00:00:00 2001
From: Chris Ruppel <chris.ruppel@gmail.com>
Date: Mon, 22 Aug 2011 15:29:50 -0500
Subject: [PATCH 4/5] Issue 1150334: changing filter setup because multiple logical groups don't export correctly

---
 cod_session/cod_session.features.field.inc         |    6 +++---
 .../cod_session.features.user_permission.inc       |   10 ++++++----
 cod_session/cod_session.views_default.inc          |   15 +--------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/cod_session/cod_session.features.field.inc b/cod_session/cod_session.features.field.inc
index eeb6c1a..5967bbd 100644
--- a/cod_session/cod_session.features.field.inc
+++ b/cod_session/cod_session.features.field.inc
@@ -562,7 +562,7 @@ function cod_session_field_default_fields() {
         ),
         'allowed_values_function' => '',
         'field_permissions' => array(
-          'create' => 0,
+          'create' => 'create',
           'edit' => 'edit',
           'edit own' => 0,
           'view' => 'view',
@@ -965,9 +965,9 @@ function cod_session_field_default_fields() {
         ),
         'allowed_values_function' => '',
         'field_permissions' => array(
-          'create' => 0,
+          'create' => 'create',
           'edit' => 'edit',
-          'edit own' => 0,
+          'edit own' => 'edit own',
           'view' => 'view',
           'view own' => 0,
         ),
diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index c8eb8a5..c8a4d58 100644
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -82,8 +82,9 @@ function cod_session_user_default_permissions() {
     'name' => 'view field_accepted',
     'roles' => array(
       0 => 'administrator',
-      1 => 'session organizer',
-      2 => 'site administrator',
+      1 => 'authenticated user',
+      2 => 'session organizer',
+      3 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -103,8 +104,9 @@ function cod_session_user_default_permissions() {
     'name' => 'view field_session_room',
     'roles' => array(
       0 => 'administrator',
-      1 => 'session organizer',
-      2 => 'site administrator',
+      1 => 'authenticated user',
+      2 => 'session organizer',
+      3 => 'site administrator',
     ),
     'module' => 'field_permissions',
   );
diff --git a/cod_session/cod_session.views_default.inc b/cod_session/cod_session.views_default.inc
index edcd717..5f7e095 100644
--- a/cod_session/cod_session.views_default.inc
+++ b/cod_session/cod_session.views_default.inc
@@ -291,10 +291,6 @@ function cod_session_views_default_views() {
 
   /* Display: Page: Proposed */
   $handler = $view->new_display('page', 'Page: Proposed', 'page_proposed');
-  $handler->display->display_options['filter_groups']['groups'] = array(
-    0 => 'AND',
-    1 => 'OR',
-  );
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -345,20 +341,11 @@ function cod_session_views_default_views() {
   $handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
   $handler->display->display_options['filters']['keys']['expose']['multiple'] = FALSE;
   /* Filter criterion: Content: Status (field_accepted) */
-  $handler->display->display_options['filters']['field_accepted_value']['id'] = 'field_accepted_value';
-  $handler->display->display_options['filters']['field_accepted_value']['table'] = 'field_data_field_accepted';
-  $handler->display->display_options['filters']['field_accepted_value']['field'] = 'field_accepted_value';
-  $handler->display->display_options['filters']['field_accepted_value']['operator'] = 'not in';
-  $handler->display->display_options['filters']['field_accepted_value']['value'] = array(
-    1 => '1',
-  );
-  $handler->display->display_options['filters']['field_accepted_value']['group'] = 1;
-  /* Filter criterion: Content: Status (field_accepted) */
   $handler->display->display_options['filters']['field_accepted_value_1']['id'] = 'field_accepted_value_1';
   $handler->display->display_options['filters']['field_accepted_value_1']['table'] = 'field_data_field_accepted';
   $handler->display->display_options['filters']['field_accepted_value_1']['field'] = 'field_accepted_value';
   $handler->display->display_options['filters']['field_accepted_value_1']['operator'] = 'empty';
-  $handler->display->display_options['filters']['field_accepted_value_1']['group'] = 1;
+  $handler->display->display_options['filters']['field_accepted_value_1']['group'] = 0;
   $handler->display->display_options['path'] = 'program/sessions/proposed';
   $handler->display->display_options['menu']['type'] = 'tab';
   $handler->display->display_options['menu']['title'] = 'Proposed Sessions';
-- 
1.7.3.4


From aa65a5e488419a83dd4eb491c595c431cadd11ab Mon Sep 17 00:00:00 2001
From: Chris Ruppel <chris.ruppel@gmail.com>
Date: Mon, 22 Aug 2011 15:31:10 -0500
Subject: [PATCH 5/5] Issue 1150334: field permissions for cod_session

---
 .../cod_session.features.user_permission.inc       |   90 ++++++++++++++++++++
 cod_session/cod_session.info                       |   10 ++
 2 files changed, 100 insertions(+), 0 deletions(-)

diff --git a/cod_session/cod_session.features.user_permission.inc b/cod_session/cod_session.features.user_permission.inc
index c8a4d58..636ea61 100644
--- a/cod_session/cod_session.features.user_permission.inc
+++ b/cod_session/cod_session.features.user_permission.inc
@@ -10,6 +10,51 @@
 function cod_session_user_default_permissions() {
   $permissions = array();
 
+  // Exported permission: create body
+  $permissions['create body'] = array(
+    'name' => 'create body',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: create field_experience
+  $permissions['create field_experience'] = array(
+    'name' => 'create field_experience',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: create field_slides
+  $permissions['create field_slides'] = array(
+    'name' => 'create field_slides',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: create field_speakers
+  $permissions['create field_speakers'] = array(
+    'name' => 'create field_speakers',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: create field_track
+  $permissions['create field_track'] = array(
+    'name' => 'create field_track',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: edit field_accepted
   $permissions['edit field_accepted'] = array(
     'name' => 'edit field_accepted',
@@ -77,6 +122,51 @@ function cod_session_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: edit own body
+  $permissions['edit own body'] = array(
+    'name' => 'edit own body',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: edit own field_slides
+  $permissions['edit own field_slides'] = array(
+    'name' => 'edit own field_slides',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: edit own field_speakers
+  $permissions['edit own field_speakers'] = array(
+    'name' => 'edit own field_speakers',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: edit own field_track
+  $permissions['edit own field_track'] = array(
+    'name' => 'edit own field_track',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: view body
+  $permissions['view body'] = array(
+    'name' => 'view body',
+    'roles' => array(
+      0 => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: view field_accepted
   $permissions['view field_accepted'] = array(
     'name' => 'view field_accepted',
diff --git a/cod_session/cod_session.info b/cod_session/cod_session.info
index a8f7e4f..6048a75 100644
--- a/cod_session/cod_session.info
+++ b/cod_session/cod_session.info
@@ -35,12 +35,22 @@ features[node][] = "room"
 features[node][] = "schedule_item"
 features[node][] = "session"
 features[node][] = "time_slot"
+features[user_permission][] = "create body"
+features[user_permission][] = "create field_experience"
+features[user_permission][] = "create field_slides"
+features[user_permission][] = "create field_speakers"
+features[user_permission][] = "create field_track"
 features[user_permission][] = "edit field_accepted"
 features[user_permission][] = "edit field_experience"
 features[user_permission][] = "edit field_session_room"
 features[user_permission][] = "edit field_session_slot"
 features[user_permission][] = "edit field_slot_datetime"
 features[user_permission][] = "edit field_track"
+features[user_permission][] = "edit own body"
+features[user_permission][] = "edit own field_slides"
+features[user_permission][] = "edit own field_speakers"
+features[user_permission][] = "edit own field_track"
+features[user_permission][] = "view body"
 features[user_permission][] = "view field_accepted"
 features[user_permission][] = "view field_experience"
 features[user_permission][] = "view field_session_room"
-- 
1.7.3.4