Issue #287 by Inlead: Rewrite ding campaign module.

ding_campaign.admin.inc

@@ -136,13 +136,16 @@ function ding_campaign_add_rule($form, $form_state) {
  */
 function ding_campaign_campaign_rule_form_submit($form, &$form_state) {
   $c = count($form_state['input']['rule_type']);
+  $nid = $form_state['build_info']['args'][0]->nid;
 
   if ($c > 0) {
     // Delete existing rules.
     db_delete('ding_campaign_rules')
-      ->condition('cid', $form_state['build_info']['args'][0]->nid)
+      ->condition('cid', $nid)
       ->execute();
 
+    entity_get_controller('node')->resetCache(array($nid));
+
     // Add new rules.
     for ($i = 0; $i < $c; $i++) {
       if ($form_state['input']['rule_value'][$i] != '' || $form_state['input']['rule_type'][$i] == 'rule_generic') {
@@ -206,8 +209,8 @@ function ding_campaign_rule_form($rule = NULL, $type = NULL) {
     '#type' => 'textfield',
     '#title' => t('Rule value'),
     '#default_value' => ($rule) ? $rule : '',
-    '#size' => 24,
-    '#maxlength' => 24,
+    '#size' => 64,
+    '#maxlength' => 255,
     '#prefix' => '<div class="rule-value">',
     '#suffix' => '</div><div class="clear"></div></div>',
     '#autocomplete_path' => 'ding_campaign/autocomplete/' . $type,

modules/ding_campaign_ctype/ding_campaign_ctype.features.field_base.inc → ding_campaign.features.field_base.inc

@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ding_campaign_ctype.features.field_base.inc
+ * ding_campaign.features.field_base.inc
  */
 
 /**
  * Implements hook_field_default_field_bases().
  */
-function ding_campaign_ctype_field_default_field_bases() {
+function ding_campaign_field_default_field_bases() {
   $field_bases = array();
 
   // Exported field_base: 'ding_campaign_group_ref'
@@ -62,6 +62,33 @@ function ding_campaign_ctype_field_default_field_bases() {
     'type' => 'entityreference',
   );
 
+  // Exported field_base: 'field_camp_behavior'
+  $field_bases['field_camp_behavior'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_camp_behavior',
+    'foreign keys' => array(),
+    'indexes' => array(
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'list',
+    'settings' => array(
+      'allowed_values' => array(
+        0 => '',
+        1 => '',
+      ),
+      'allowed_values_function' => '',
+      'profile2_private' => FALSE,
+    ),
+    'translatable' => 0,
+    'type' => 'list_boolean',
+  );
+
   // Exported field_base: 'field_camp_image'
   $field_bases['field_camp_image'] = array(
     'active' => 1,

modules/ding_campaign_ctype/ding_campaign_ctype.features.field_instance.inc → ding_campaign.features.field_instance.inc

@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * ding_campaign_ctype.features.field_instance.inc
+ * ding_campaign.features.field_instance.inc
  */
 
 /**
  * Implements hook_field_default_field_instances().
  */
-function ding_campaign_ctype_field_default_field_instances() {
+function ding_campaign_field_default_field_instances() {
   $field_instances = array();
 
   // Exported field_instance: 'node-ding_campaign-ding_campaign_group_ref'
@@ -82,6 +82,61 @@ function ding_campaign_ctype_field_default_field_instances() {
     ),
   );
 
+  // Exported field_instance: 'node-ding_campaign-field_camp_behavior'
+  $field_instances['node-ding_campaign-field_camp_behavior'] = array(
+    'bundle' => 'ding_campaign',
+    'default_value' => array(
+      0 => array(
+        'value' => 0,
+      ),
+    ),
+    'deleted' => 0,
+    'description' => 'If set, the clicked campaign will open in a new tab/window',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'list',
+        'settings' => array(),
+        'type' => 'list_default',
+        'weight' => 8,
+      ),
+      'full' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser_highlight' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_camp_behavior',
+    'label' => 'Open in new tab/window',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(
+        'display_label' => 1,
+      ),
+      'type' => 'options_onoff',
+      'weight' => 7,
+    ),
+  );
+
   // Exported field_instance: 'node-ding_campaign-field_camp_image'
   $field_instances['node-ding_campaign-field_camp_image'] = array(
     'bundle' => 'ding_campaign',
@@ -259,7 +314,7 @@ function ding_campaign_ctype_field_default_field_instances() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_buttons',
-      'weight' => 4,
+      'weight' => 2,
     ),
   );
 
@@ -429,7 +484,9 @@ function ding_campaign_ctype_field_default_field_instances() {
   t('Campaign link');
   t('Campaign settings');
   t('Campaign text');
+  t('If set, the clicked campaign will open in a new tab/window');
   t('Libraries and Groups');
+  t('Open in new tab/window');
   t('Weight');
 
   return $field_instances;