Index: views/project.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/views/project.views_default.inc,v
retrieving revision 1.2
diff -u -p -r1.2 project.views_default.inc
--- views/project.views_default.inc	30 Jan 2009 07:52:24 -0000	1.2
+++ views/project.views_default.inc	28 Sep 2009 05:23:33 -0000
@@ -91,7 +91,7 @@ function project_views_default_views() {
   $views[$view->name] = $view;
 
   $view = new view;
-  $view->name = 'project_overview_2';
+  $view->name = 'project_overview';
   $view->description = 'A view for browsing projects.';
   $view->tag = 'project';
   $view->view_php = '';
@@ -100,17 +100,8 @@ function project_views_default_views() {
   $view->api_version = 2;
   $view->disabled = TRUE;
   $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
-    'project_release_version' => array(
-      'label' => 'release',
-      'required' => 0,
-      'id' => 'project_release_version',
-      'table' => 'node',
-      'field' => 'project_release_version',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('fields', array(
+
+  $fields = array(
     'title' => array(
       'label' => '',
       'link_to_node' => 1,
@@ -166,8 +157,9 @@ function project_views_default_views() {
       'field' => 'project_type_tid',
       'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('sorts', array(
+  );
+
+  $sorts = array(
     'sticky' => array(
       'order' => 'DESC',
       'id' => 'sticky',
@@ -188,7 +180,6 @@ function project_views_default_views() {
       'id' => 'changed',
       'table' => 'node',
       'field' => 'changed',
-      'relationship' => 'project_release_version',
     ),
     'title_1' => array(
       'order' => 'ASC',
@@ -197,8 +188,9 @@ function project_views_default_views() {
       'field' => 'title',
       'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('arguments', array(
+  );
+
+  $arguments = array(
     'tid' => array(
       'default_action' => 'not found',
       'style_plugin' => 'default_summary',
@@ -225,7 +217,6 @@ function project_views_default_views() {
       'default_argument_php' => '',
       'validate_argument_node_type' => array(
         'project_project' => 0,
-        'project_release' => 0,
         'book' => 0,
         'page' => 0,
         'story' => 0,
@@ -252,8 +243,9 @@ function project_views_default_views() {
         'button' => 'Override',
       ),
     ),
-  ));
-  $handler->override_option('filters', array(
+  );
+
+  $filters = array(
     'type' => array(
       'operator' => 'in',
       'value' => array(
@@ -284,33 +276,6 @@ function project_views_default_views() {
       'field' => 'status',
       'relationship' => 'none',
     ),
-    'project_release_api_version' => array(
-      'operator' => 'or',
-      'value' => array(),
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'project_release_api_version_op',
-        'identifier' => 'api',
-        'label' => 'API Version',
-        'optional' => 1,
-        'single' => 1,
-        'remember' => 1,
-        'reduce' => 0,
-      ),
-      'type' => 'select',
-      'vid' => '2',
-      'reduce_duplicates' => TRUE,
-      'id' => 'project_release_api_version',
-      'table' => 'term_node',
-      'field' => 'project_release_api_version',
-      'hierarchy' => 0,
-      'relationship' => 'project_release_version',
-      'override' => array(
-        'button' => 'Override',
-      ),
-    ),
     'keys' => array(
       'operator' => 'optional',
       'value' => '',
@@ -397,7 +362,12 @@ function project_views_default_views() {
       'field' => 'project_sort_method',
       'relationship' => 'none',
     ),
-  ));
+  );
+
+  $handler->override_option('fields', $fields);
+  $handler->override_option('sorts', $sorts);
+  $handler->override_option('arguments', $arguments);
+  $handler->override_option('filters', $filters);
   $handler->override_option('access', array(
     'type' => 'perm',
     'role' => array(),
@@ -415,315 +385,6 @@ function project_views_default_views() {
     'separator' => '',
   ));
   $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('path', 'project2/%');
-  $handler->override_option('menu', array(
-    'type' => 'none',
-    'title' => 'Yuki',
-    'weight' => '0',
-  ));
-  $handler->override_option('tab_options', array(
-    'type' => 'none',
-    'title' => '',
-    'weight' => 0,
-  ));
-  $handler = $view->new_display('feed', 'Feed', 'feed_1');
-  $handler->override_option('style_plugin', 'rss');
-  $handler->override_option('style_options', array(
-    'mission_description' => FALSE,
-    'description' => '',
-  ));
-  $handler->override_option('row_plugin', 'node_rss');
-  $handler->override_option('row_options', array(
-    'item_length' => 'default',
-  ));
-  $handler->override_option('path', 'project2/%/feed');
-  $handler->override_option('menu', array(
-    'type' => 'none',
-    'title' => '',
-    'weight' => 0,
-  ));
-  $handler->override_option('tab_options', array(
-    'type' => 'none',
-    'title' => '',
-    'weight' => 0,
-  ));
-  $handler->override_option('displays', array(
-    'default' => 'default',
-    'page_1' => 'page_1',
-  ));
-  $handler->override_option('sitename_title', FALSE);
-  $views[$view->name] = $view;
-
-  $view = new view;
-  $view->name = 'project_overview';
-  $view->description = 'A view for browsing projects.';
-  $view->tag = 'project';
-  $view->view_php = '';
-  $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
-  $view->disabled = TRUE;
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('relationships', array(
-    'project_release_version' => array(
-      'label' => 'release',
-      'required' => 0,
-      'id' => 'project_release_version',
-      'table' => 'node',
-      'field' => 'project_release_version',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('sorts', array(
-    'sticky' => array(
-      'order' => 'DESC',
-      'id' => 'sticky',
-      'table' => 'node',
-      'field' => 'sticky',
-      'relationship' => 'none',
-    ),
-    'title' => array(
-      'order' => 'ASC',
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
-    ),
-    'changed' => array(
-      'order' => 'DESC',
-      'granularity' => 'day',
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'project_release_version',
-    ),
-    'title_1' => array(
-      'order' => 'ASC',
-      'id' => 'title_1',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('arguments', array(
-    'tid' => array(
-      'default_action' => 'not found',
-      'style_plugin' => 'default_summary',
-      'style_options' => array(),
-      'wildcard' => 'all',
-      'wildcard_substitution' => 'All',
-      'title' => '%1',
-      'default_argument_type' => 'fixed',
-      'default_argument' => '',
-      'validate_type' => 'project_type_term',
-      'validate_fail' => 'not found',
-      'break_phrase' => 0,
-      'add_table' => 0,
-      'require_value' => 0,
-      'reduce_duplicates' => 1,
-      'set_breadcrumb' => 0,
-      'id' => 'tid',
-      'table' => 'term_node',
-      'field' => 'tid',
-      'relationship' => 'none',
-      'default_options_div_prefix' => '',
-      'default_argument_user' => 0,
-      'default_argument_fixed' => '',
-      'default_argument_php' => '',
-      'validate_argument_node_type' => array(
-        'project_project' => 0,
-        'project_release' => 0,
-        'book' => 0,
-        'page' => 0,
-        'story' => 0,
-      ),
-      'validate_argument_node_access' => 0,
-      'validate_argument_nid_type' => 'nid',
-      'validate_argument_vocabulary' => array(
-        '3' => 0,
-        '5' => 0,
-        '2' => 0,
-        '1' => 0,
-        '4' => 0,
-      ),
-      'validate_argument_type' => 'tid',
-      'validate_argument_project_term_vocabulary' => array(
-        '1' => 1,
-      ),
-      'validate_argument_project_term_argument_type' => 'convert',
-      'validate_argument_project_term_argument_action_top_without' => 'pass',
-      'validate_argument_project_term_argument_action_top_with' => 'pass',
-      'validate_argument_project_term_argument_action_child' => 'pass',
-      'validate_argument_php' => '',
-      'override' => array(
-        'button' => 'Override',
-      ),
-    ),
-  ));
-  $handler->override_option('filters', array(
-    'type' => array(
-      'operator' => 'in',
-      'value' => array(
-        'project_project' => 'project_project',
-      ),
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
-        'operator' => FALSE,
-        'label' => '',
-      ),
-      'id' => 'type',
-      'table' => 'node',
-      'field' => 'type',
-      'relationship' => 'none',
-    ),
-    'status' => array(
-      'operator' => '=',
-      'value' => 1,
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
-        'operator' => FALSE,
-        'label' => '',
-      ),
-      'id' => 'status',
-      'table' => 'node',
-      'field' => 'status',
-      'relationship' => 'none',
-    ),
-    'project_release_api_version' => array(
-      'operator' => 'or',
-      'value' => array(),
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'project_release_api_version_op',
-        'identifier' => 'api',
-        'label' => 'API Version',
-        'optional' => 1,
-        'single' => 1,
-        'remember' => 1,
-        'reduce' => 0,
-      ),
-      'type' => 'select',
-      'vid' => '2',
-      'reduce_duplicates' => TRUE,
-      'id' => 'project_release_api_version',
-      'table' => 'term_node',
-      'field' => 'project_release_api_version',
-      'hierarchy' => 0,
-      'relationship' => 'project_release_version',
-      'override' => array(
-        'button' => 'Override',
-      ),
-    ),
-    'keys' => array(
-      'operator' => 'optional',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'keys_op',
-        'identifier' => 'keywords',
-        'label' => 'Keywords:',
-        'optional' => 1,
-        'remember' => 0,
-      ),
-      'id' => 'keys',
-      'table' => 'search_index',
-      'field' => 'keys',
-      'override' => array(
-        'button' => 'Override',
-      ),
-      'relationship' => 'none',
-    ),
-    'project_type_tid' => array(
-      'operator' => 'or',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'project_type_tid_op',
-        'identifier' => 'type',
-        'label' => 'Category:',
-        'optional' => 1,
-        'single' => 1,
-        'remember' => 0,
-        'reduce' => 0,
-      ),
-      'type' => 'select',
-      'vid' => '1',
-      'associated_argument' => '0',
-      'remove_if_no_options' => 1,
-      'argument_position' => '0',
-      'id' => 'project_type_tid',
-      'table' => 'term_node',
-      'field' => 'project_type_tid',
-      'relationship' => 'none',
-      'reduce_duplicates' => 1,
-    ),
-    'project_sort_method' => array(
-      'value' => 'sticky',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'operator' => '',
-        'label' => 'Sort by:',
-        'identifier' => 'sort_by',
-        'optional' => 0,
-        'single' => 1,
-        'remember' => 0,
-      ),
-      'sort_methods' => array(
-        'changed' => array(
-          'enabled' => 1,
-          'weight' => '-23',
-          'display_name' => 'Date',
-        ),
-        'title_1' => array(
-          'enabled' => 0,
-          'weight' => '-25',
-          'display_name' => 'title_1',
-        ),
-        'sticky' => array(
-          'enabled' => 0,
-          'weight' => '-24',
-          'display_name' => 'sticky',
-        ),
-        'title' => array(
-          'enabled' => 1,
-          'weight' => '-22',
-          'display_name' => 'Name',
-        ),
-      ),
-      'id' => 'project_sort_method',
-      'table' => 'views',
-      'field' => 'project_sort_method',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('access', array(
-    'type' => 'perm',
-    'role' => array(),
-    'perm' => 'browse project listings',
-  ));
-  $handler->override_option('empty', 'No results were found.');
-  $handler->override_option('empty_format', '1');
-  $handler->override_option('items_per_page', 30);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('distinct', 1);
-  $handler->override_option('style_plugin', 'project_list');
-  $handler->override_option('row_plugin', 'project_node');
-  $handler->override_option('row_options', array(
-    'project_teaser' => 1,
-    'project_term_links' => 1,
-    'project_release_download_table' => 1,
-    'project_release_download_link' => 1,
-  ));
-  $handler = $view->new_display('page', 'Page', 'page_1');
   $handler->override_option('path', 'project/%');
   $handler->override_option('menu', array(
     'type' => 'none',