weekly build 3

profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.install

@@ -3,6 +3,29 @@
  * @file
  */
 
+/**
+ * Implements hook_update_N().
+ *
+ * Update draggableviews entry to match new taxonomy term context.
+ */
+function ocio_featured_slideshow_update_7101() {
+  $nodes = node_load_multiple(array(), array('type' => 'featured_slide'));
+  foreach ($nodes as $node) {
+    if (!empty($node->field_assign_to_slideshow)) {
+      $tid = $node->field_assign_to_slideshow['und'][0]['tid'];
+
+      if ($node->type == 'featured_slide') {
+        db_update('draggableviews_structure')
+        ->fields(array(
+          'args' => '["' . $tid . '"]'
+          ))
+        ->condition('entity_id', $node->nid)
+        ->execute();
+      }
+    }
+  }
+}
+
 /**
  * Implements hook_update_N().
  *

profiles/wcm_base/modules/custom/ocio_featured_slideshow/ocio_featured_slideshow.views_default.inc

@@ -87,32 +87,20 @@ function ocio_featured_slideshow_views_default_views() {
   $handler->display->display_options['sorts']['weight']['draggableviews_setting_view'] = 'featured_slideshow:page_1';
   $handler->display->display_options['sorts']['weight']['draggableviews_setting_arguments'] = 'none';
   $handler->display->display_options['sorts']['weight']['draggableviews_setting_new_items_bottom_list'] = 1;
-  /* Sort criterion: Content: Post date */
-  $handler->display->display_options['sorts']['created']['id'] = 'created';
-  $handler->display->display_options['sorts']['created']['table'] = 'node';
-  $handler->display->display_options['sorts']['created']['field'] = 'created';
-  $handler->display->display_options['sorts']['created']['order'] = 'DESC';
-  /* Contextual filter: Content: Has taxonomy term ID */
-  $handler->display->display_options['arguments']['tid']['id'] = 'tid';
-  $handler->display->display_options['arguments']['tid']['table'] = 'taxonomy_index';
-  $handler->display->display_options['arguments']['tid']['field'] = 'tid';
-  $handler->display->display_options['arguments']['tid']['default_action'] = 'not found';
-  $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'taxonomy_tid';
-  $handler->display->display_options['arguments']['tid']['default_argument_options']['term_page'] = FALSE;
-  $handler->display->display_options['arguments']['tid']['default_argument_options']['node'] = TRUE;
-  $handler->display->display_options['arguments']['tid']['default_argument_options']['limit'] = TRUE;
-  $handler->display->display_options['arguments']['tid']['default_argument_options']['vocabularies'] = array(
-    'featured_slideshow' => 'featured_slideshow',
-  );
-  $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['tid']['specify_validation'] = TRUE;
-  $handler->display->display_options['arguments']['tid']['validate']['type'] = 'taxonomy_term';
-  $handler->display->display_options['arguments']['tid']['validate_options']['vocabularies'] = array(
+  /* Contextual filter: Content: Assign to slideshow (field_assign_to_slideshow) */
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['id'] = 'field_assign_to_slideshow_tid';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['table'] = 'field_data_field_assign_to_slideshow';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['field'] = 'field_assign_to_slideshow_tid';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['default_action'] = 'not found';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['specify_validation'] = TRUE;
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['validate']['type'] = 'taxonomy_term';
+  $handler->display->display_options['arguments']['field_assign_to_slideshow_tid']['validate_options']['vocabularies'] = array(
     'featured_slideshow' => 'featured_slideshow',
   );
-  $handler->display->display_options['arguments']['tid']['validate_options']['transform'] = TRUE;
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -133,8 +121,9 @@ function ocio_featured_slideshow_views_default_views() {
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['defaults']['access'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['defaults']['header'] = FALSE;
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Field: Content: Banner Image Text Color */
+  /* Field: Content: Slide Text Color */
   $handler->display->display_options['fields']['field_banner_image_text_color']['id'] = 'field_banner_image_text_color';
   $handler->display->display_options['fields']['field_banner_image_text_color']['table'] = 'field_data_field_banner_image_text_color';
   $handler->display->display_options['fields']['field_banner_image_text_color']['field'] = 'field_banner_image_text_color';
@@ -142,7 +131,7 @@ function ocio_featured_slideshow_views_default_views() {
   $handler->display->display_options['fields']['field_banner_image_text_color']['exclude'] = TRUE;
   $handler->display->display_options['fields']['field_banner_image_text_color']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_banner_image_text_color']['type'] = 'list_key';
-  /* Field: Content: Banner Image Text Background */
+  /* Field: Content: Slide Text Background  */
   $handler->display->display_options['fields']['field_banner_image_text_bkground']['id'] = 'field_banner_image_text_bkground';
   $handler->display->display_options['fields']['field_banner_image_text_bkground']['table'] = 'field_data_field_banner_image_text_bkground';
   $handler->display->display_options['fields']['field_banner_image_text_bkground']['field'] = 'field_banner_image_text_bkground';
@@ -168,7 +157,7 @@ function ocio_featured_slideshow_views_default_views() {
   $handler->display->display_options['fields']['field_featured_summary']['label'] = '';
   $handler->display->display_options['fields']['field_featured_summary']['exclude'] = TRUE;
   $handler->display->display_options['fields']['field_featured_summary']['element_label_colon'] = FALSE;
-  /* Field: Content: Disable Title */
+  /* Field: Content: Hide Title and Summary */
   $handler->display->display_options['fields']['field_disable_title']['id'] = 'field_disable_title';
   $handler->display->display_options['fields']['field_disable_title']['table'] = 'field_data_field_disable_title';
   $handler->display->display_options['fields']['field_disable_title']['field'] = 'field_disable_title';
@@ -210,6 +199,13 @@ function ocio_featured_slideshow_views_default_views() {
     'image_style' => 'ocio_slideshow_image',
     'image_link' => '',
   );
+  $handler->display->display_options['defaults']['sorts'] = FALSE;
+  /* Sort criterion: Draggableviews: Weight */
+  $handler->display->display_options['sorts']['weight']['id'] = 'weight';
+  $handler->display->display_options['sorts']['weight']['table'] = 'draggableviews_structure';
+  $handler->display->display_options['sorts']['weight']['field'] = 'weight';
+  $handler->display->display_options['sorts']['weight']['draggableviews_setting_view'] = 'featured_slideshow:page_1';
+  $handler->display->display_options['sorts']['weight']['draggableviews_setting_new_items_bottom_list'] = 1;
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Content: Published */
@@ -385,7 +381,7 @@ Drag slides to arrange the order in which they will appear in this slideshow.';
   $handler->display->display_options['fields']['field_ocio_link']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['field_ocio_link']['click_sort_column'] = 'url';
   $handler->display->display_options['fields']['field_ocio_link']['type'] = 'link_url';
-  /* Field: Content: Slideshow */
+  /* Field: Content: Assign to slideshow */
   $handler->display->display_options['fields']['field_assign_to_slideshow']['id'] = 'field_assign_to_slideshow';
   $handler->display->display_options['fields']['field_assign_to_slideshow']['table'] = 'field_data_field_assign_to_slideshow';
   $handler->display->display_options['fields']['field_assign_to_slideshow']['field'] = 'field_assign_to_slideshow';
@@ -422,6 +418,13 @@ Drag slides to arrange the order in which they will appear in this slideshow.';
   $handler->display->display_options['fields']['nothing']['table'] = 'views';
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = 'Operations';
+  $handler->display->display_options['defaults']['sorts'] = FALSE;
+  /* Sort criterion: Draggableviews: Weight */
+  $handler->display->display_options['sorts']['weight']['id'] = 'weight';
+  $handler->display->display_options['sorts']['weight']['table'] = 'draggableviews_structure';
+  $handler->display->display_options['sorts']['weight']['field'] = 'weight';
+  $handler->display->display_options['sorts']['weight']['draggableviews_setting_view'] = 'featured_slideshow:page_1';
+  $handler->display->display_options['sorts']['weight']['draggableviews_setting_new_items_bottom_list'] = 1;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: Content: Has taxonomy term ID */
   $handler->display->display_options['arguments']['tid']['id'] = 'tid';
@@ -437,8 +440,6 @@ Drag slides to arrange the order in which they will appear in this slideshow.';
   $handler->display->display_options['arguments']['tid']['validate_options']['vocabularies'] = array(
     'featured_slideshow' => 'featured_slideshow',
   );
-  $handler->display->display_options['arguments']['tid']['validate_options']['type'] = 'convert';
-  $handler->display->display_options['arguments']['tid']['validate_options']['transform'] = TRUE;
   $handler->display->display_options['arguments']['tid']['validate']['fail'] = 'empty';
   $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
@@ -517,17 +518,22 @@ Drag slides to arrange the order in which they will appear in this slideshow.';
   $handler->display->display_options['empty']['area']['empty'] = TRUE;
   $handler->display->display_options['empty']['area']['content'] = 'This slideshow is currently empty.';
   $handler->display->display_options['empty']['area']['format'] = 'filtered_html';
-  /* Relationship: Taxonomy term: Content using Slideshow */
+  /* Relationship: Taxonomy term: Content using Assign to slideshow */
   $handler->display->display_options['relationships']['reverse_field_assign_to_slideshow_node']['id'] = 'reverse_field_assign_to_slideshow_node';
   $handler->display->display_options['relationships']['reverse_field_assign_to_slideshow_node']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['relationships']['reverse_field_assign_to_slideshow_node']['field'] = 'reverse_field_assign_to_slideshow_node';
+  /* Field: Taxonomy term: Term ID */
+  $handler->display->display_options['fields']['tid']['id'] = 'tid';
+  $handler->display->display_options['fields']['tid']['table'] = 'taxonomy_term_data';
+  $handler->display->display_options['fields']['tid']['field'] = 'tid';
+  $handler->display->display_options['fields']['tid']['exclude'] = TRUE;
   /* Field: Taxonomy term: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'taxonomy_term_data';
   $handler->display->display_options['fields']['name']['field'] = 'name';
   $handler->display->display_options['fields']['name']['label'] = 'Slideshow Name';
   $handler->display->display_options['fields']['name']['alter']['make_link'] = TRUE;
-  $handler->display->display_options['fields']['name']['alter']['path'] = 'admin/workbench/slideshow/[name]';
+  $handler->display->display_options['fields']['name']['alter']['path'] = 'admin/workbench/slideshow/[tid]';
   $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = TRUE;
   $handler->display->display_options['fields']['name']['alter']['path_case'] = 'lower';
   $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE;
@@ -560,22 +566,21 @@ Drag slides to arrange the order in which they will appear in this slideshow.';
   $handler->display->display_options['pager']['type'] = 'some';
   $handler->display->display_options['defaults']['relationships'] = FALSE;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
-  /* Contextual filter: Taxonomy term: Name */
-  $handler->display->display_options['arguments']['name']['id'] = 'name';
-  $handler->display->display_options['arguments']['name']['table'] = 'taxonomy_term_data';
-  $handler->display->display_options['arguments']['name']['field'] = 'name';
-  $handler->display->display_options['arguments']['name']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['name']['summary']['number_of_records'] = '0';
-  $handler->display->display_options['arguments']['name']['summary']['format'] = 'default_summary';
-  $handler->display->display_options['arguments']['name']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['name']['specify_validation'] = TRUE;
-  $handler->display->display_options['arguments']['name']['validate']['type'] = 'taxonomy_term';
-  $handler->display->display_options['arguments']['name']['validate_options']['vocabularies'] = array(
+  /* Contextual filter: Taxonomy term: Term ID */
+  $handler->display->display_options['arguments']['tid']['id'] = 'tid';
+  $handler->display->display_options['arguments']['tid']['table'] = 'taxonomy_term_data';
+  $handler->display->display_options['arguments']['tid']['field'] = 'tid';
+  $handler->display->display_options['arguments']['tid']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['tid']['summary']['number_of_records'] = '0';
+  $handler->display->display_options['arguments']['tid']['summary']['format'] = 'default_summary';
+  $handler->display->display_options['arguments']['tid']['summary_options']['items_per_page'] = '25';
+  $handler->display->display_options['arguments']['tid']['specify_validation'] = TRUE;
+  $handler->display->display_options['arguments']['tid']['validate']['type'] = 'taxonomy_term';
+  $handler->display->display_options['arguments']['tid']['validate_options']['vocabularies'] = array(
     'featured_slideshow' => 'featured_slideshow',
   );
-  $handler->display->display_options['arguments']['name']['validate_options']['transform'] = TRUE;
-  $handler->display->display_options['arguments']['name']['validate']['fail'] = 'empty';
-  $handler->display->display_options['arguments']['name']['limit'] = '0';
+  $handler->display->display_options['arguments']['tid']['validate_options']['type'] = 'name';
+  $handler->display->display_options['arguments']['tid']['validate']['fail'] = 'empty';
   $export['featured_slideshow_tags'] = $view;
 
   return $export;