Conjunto de cambios 8f5c26c en sipes para modules_contrib/nodereference_autocreate/nodereference_autocreate.module

Fecha y hora:

30/05/2016 10:53:19 (hace 8 años)

Autor:

José Gregorio Puentes <jpuentes@…>

Branches:

stable, version-3.0

Children:

e69205c

Parents:

664c856

Mensaje:

se actualizo el modulo

Fichero:

• modules_contrib/nodereference_autocreate/nodereference_autocreate.module (modificado) (9 diferencias)

modules_contrib/nodereference_autocreate/nodereference_autocreate.module

@@ -24 +24 @@
 
 /**
-* Implementation of hook_widget_settings().
-*/
-function nodereference_autocreate_widget_settings($op, $widget) {
-  switch ($op) {
-    case 'form':
-      $types = content_types();
-      $options_fields = array();
-      foreach($types as $content_name => $content_type) {
-        $fields = $content_type['fields'];
-        foreach ($fields as $name => $field) {
-          //only allow field type text
-          if ($field['type'] == 'text') {
-            $options_fields[$field['field_name']] = strip_tags(t('Field %field in content type %content_type', array('%field' => check_plain(filter_xss($field['widget']['label'])), '%content_type' => check_plain(filter_xss($content_type['name'])))));
-          }
-        }
-        $fields = $content_type['extra'];
-        $exclude_fields = array(
-          'revision_information',
-          'author',
-          'options',
-          'comment_settings',
-          'menu',
-          'path',
-        );
-        foreach ($fields as $name => $field) {
-          if (!in_array($name, $exclude_fields)) {
-            $options_fields[$content_type['type']. '_' . $name] = strip_tags(t('Field %field in content type %content_type', array('%field' => check_plain(filter_xss($field['label'])), '%content_type' => check_plain(filter_xss($content_type['name'])))));
-          }
-        }
-      }
-      $option = (isset($widget['nodereference_save_field_type']) && $options_fields[$widget['nodereference_save_field_type']]) ? $widget['nodereference_save_field_type'] : '';
-      $form = array();
-
-      $form['nodereference_save_field'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Auto-created node based in fields'),
-        '#description' => t('Settings auto-created node based in fields.'),
-      );
-      $form['nodereference_save_field']['nodereference_save_field_type'] = array(
-        '#type' => 'select',
-        '#title' => t('Save data in content field'),
-        '#default_value' => $option,
-        '#options' => $options_fields,
-        '#required' => TRUE,
-      );
-      $options = array(
-        'text_textfield' => 'textfield',
-        'text_textarea' => 'textarea',
-      );
-      $option = (isset($widget['nodereference_field_type']) && $options[$widget['nodereference_field_type']]) ? $widget['nodereference_field_type'] : '';
-      $form['nodereference_save_field']['nodereference_field_type'] = array(
-        '#type' => 'select',
-        '#title' => t('Save data in content field'),
-        '#default_value' => $option,
-        '#options' => $options,
-        '#required' => TRUE,
-      );
-      $form['nodereference_save_field']['nodereference_title_default'] = array(
-        '#title' => t('Title default'),
-        '#type' => 'textfield',
-        '#default_value' => isset($widget['nodereference_title_default']) ? $widget['nodereference_title_default'] : NULL,
-        '#maxlength' => 255,
-      );
-      $form['nodereference_save_field']['nodereference_title_delta'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Add delta in title'),
-        '#default_value' => isset($widget['nodereference_title_delta']) ? $widget['nodereference_title_delta'] : NULL,
-        '#return_value' => 1,
-      );
-      return $form;
-    break;
-    case 'save':
-      return array(
-        'nodereference_save_field_type',
-        'nodereference_field_type',
-        'nodereference_title_default',
-        'nodereference_title_delta',
-      );
-    break;
-  }
-}
-
-/**
  * Implementation of hook_widget().
  */
@@ -118 +35 @@
         '#process' => array('nodereference_autocreate_process'),
       );
-      $element['#type'] = $field['widget']['nodereference_field_type'];
       break;
   }
@@ -130 +46 @@
  */
 function nodereference_autocreate_value($element, $edit = FALSE) {
-  //get field data
-  $field_name = $element['#field_name'];
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $content_type = nodereference_autocreate_type_get($field['referenceable_types']);
-  $type = content_types($content_type);
-  $nodereference_save_field_type = $field['widget']['nodereference_save_field_type'];
-  $pos = strpos($nodereference_save_field_type, $content_type);
-  $field = $nodereference_save_field_type;
-  if ($pos == 0) {
-    $field = str_replace($content_type . '_', '', $nodereference_save_field_type);
-    $field = str_replace('_field', '', $field);
-  }
-
   $field_key = $element['#columns'][0];
   if ($nid = $element['#default_value'][$field_key]) {
-    if ($element['#nid'][$field_key]) {
-$nid = $element['#nid'][$field_key];
-}
-    $current_node = node_load($nid);
-    $value = $current_node->{$field};
-    $current_value = $value;
-    if (is_array($value)) {
-      $current_value = $value[0]['value'];
-    }
-    else {
-      $current_value = $value;
-    }
-    return array($field_key => $current_value);
+    $value = db_result(db_query(db_rewrite_sql('SELECT n.title FROM {node} n WHERE n.nid = %d'), $nid));
+    return array($field_key => $value);
   }
   return array($field_key => NULL);
@@ -170 +61 @@
 function nodereference_autocreate_process($element, $edit, $form_state, $form) {
   $field_key = $element['#columns'][0];
+
   $element[$field_key] = array(
-    '#type' => $element['#type'],
+    '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need to be
@@ -182 +74 @@
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-    '#nid' => 'casaloca',
   );
   if (empty($element[$field_key]['#element_validate'])) {
@@ -188 +79 @@
   }
   array_unshift($element[$field_key]['#element_validate'], 'nodereference_autocreate_validate');
+
   return $element;
 }
@@ -205 +97 @@
   $value = $element['#value'][$field_key];
   $nid = NULL;
+
   if ($value) {
     // Load the current value stored in the database.
-    $self_nid = $form_state['values']['nid'];
-    //get nid if lost(case editablefields)
-    if(!$self_nid && $form_state['node']->nid) {
-      $self_nid = $form_state['node']->nid;
-    }
-    $self = node_load($self_nid);
+    $self = node_load($form_state['values']['nid']);
     $current_nid = $self->$field_name;
     $current_nid = $current_nid[$delta]['nid'];
-    $default_title = 'node';
-    if (trim($field['widget']['nodereference_title_default'])) {
-      $default_title = $field['widget']['nodereference_title_default'];
-    }
-    if ($field['widget']['nodereference_title_delta']) {
-      $count = $delta + 1;
-      $default_title .= $count;
-    }
-    $default_title = check_plain($default_title);
-    $nodereference_save_field_type = $field['widget']['nodereference_save_field_type'];
-    $content_type = nodereference_autocreate_type_get($field['referenceable_types']);
-    $pos = strpos($nodereference_save_field_type, $content_type);
-    $replace_field = $nodereference_save_field_type;
-    $extra_field = FALSE;
-    if ($pos == 0) {
-      $replace_field = str_replace($content_type . '_', '', $nodereference_save_field_type);
-      $replace_field = str_replace('_field', '', $replace_field);
-      $extra_node->$replace_field = $value;
-    }
-    else {
-      $extra_node->$replace_field[0]['value'] = $value;
-    }
+
     if ($current_nid) {
       // Referenced node exists, update its title if changed.
       $referenced_node = node_load($current_nid);
-      if ($referenced_node->{$replace_field} != $extra_node->{$replace_field} || $referenced_node->title != $default_title) {
-        $referenced_node->title = $default_title;
-        $referenced_node->$replace_field = $extra_node->$replace_field;
+      if ($referenced_node->title != $value) {
+        $referenced_node->title = $value;
         node_save($referenced_node);
       }
+
       $nid = $referenced_node->nid;
     }
     else {
       // Create a new node with the specified title.
-      global $user;
       $node = new stdClass();
       $node->type = nodereference_autocreate_type_get($field['referenceable_types']);
-      $node->title = $default_title;
-      $node->uid = $user->uid;
-      $node->{$replace_field} = $extra_node->{$replace_field};
+      $node->title = $value;
       node_save($node);
+
       if (!$node->nid) {
         form_error($element[$field_key], t('%name: failed to create sub node.', array('%name' => t($field['widget']['label']))));
@@ -274 +139 @@
     $form['field']['referenceable_types']['#description'] .= t('Only one type can be referenced when using the ' .
       'auto-create node widget. The node type referenced will be used when creating a node.');
+
     $form['#validate'][] = 'nodereference_autocreate_content_field_edit_form_validate';
   }
@@ -293 +159 @@
         }
       }
+
       if ($count > 1) {
         form_set_error('referenceable_types', t('Only one content type can be referenced for widgets of type <em>Auto-create node</em>.'));