--- editablefields.module.old 2008-12-31 12:48:25.000000000 +0100 +++ editablefields.module 2008-12-31 13:25:22.000000000 +0100 @@ -1,132 +1,136 @@ 'editablefields_html', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, 'title' => 'ajax form', - ); + ); $items['editablefields_submit'] = array( 'page callback' => 'editablefields_submit', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, 'title' => 'ajax submit', - ); + ); return $items; } +/** + * Implementation of hook_theme(). + */ function editablefields_theme() { return array( 'editablefields_formatter_editable' => array( 'arguments' => array('element' => NULL), ), ); -}; - +} -function editablefields_field_formatter_info() -{ +/** + * Implementation of hook_field_formatter_info(). + */ +function editablefields_field_formatter_info() { return array( 'editable' => array( - 'label' => 'Editable', + 'label' => t('Editable'), 'field types' => array_keys(_content_field_types()), - )); + ), + ); } -function theme_editablefields_formatter_editable($element) -{ - $field_name=$element['#field_name']; +/** + * Theme the editable field. + */ +function theme_editablefields_formatter_editable($element) { + $field_name = $element['#field_name']; $field = content_fields($field_name); - $node=$element['#node']; - + $node = $element['#node']; // See if access to this form element is restricted, // if so, skip widget processing and just set the value. - $access = TRUE; - $field_access = module_invoke_all('field_access', 'edit', $field); - foreach ($field_access as $value) { - if (empty($value)) { - $access = FALSE; - } - } - if (!$access) { + if (!content_access('edit', $field)) { // can't edit $formatter_name = 'default'; if ($formatter = _content_get_formatter($formatter_name, $field['type'])) { $theme = $formatter['module'] .'_formatter_'. $formatter_name; - return theme($theme,$element); + return theme($theme, $element); } - } else { + } + else { $formatter_name = 'default'; if ($formatter = _content_get_formatter($formatter_name, $field['type'])) { $theme = $formatter['module'] .'_formatter_'. $formatter_name; - return '
'. - theme($theme,$element). - '
'; + return '
'. theme($theme, $element) .'
'; } } - } - +/** + * Implementation of hook_forms(). + */ function editablefields_forms() { + $forms = array(); $forms['editablefields_form'] = array( 'callback' => 'editablefields_form_builder', -// 'callback arguments' => array('node','field_name'), +// 'callback arguments' => array('node', 'field_name'), ); return $forms; } - -function editablefields_form_builder(&$form_state, $node,$field_name) -{ +/** + * Form builder callback. + */ +function editablefields_form_builder(&$form_state, $node, $field_name) { $field = content_fields($field_name); - + $form = array('#node' => $node); $form_state = array('values' => array($field['field_name'] => $default_value)); module_load_include('inc', 'content', 'includes/content.node_form'); $form['#field_info'] = array($field['field_name'] => $field); $form = content_field_form($form, $form_state, $field, 0); - + unset($form[$field_name]['#title']); if (is_array($form[$field_name][0]) && !is_array($form[$field_name][1])) { unset($form[$field_name][0]['#title']); } - + $form['#field_info'] = array($field['field_name'] => $field); return $form; } - - - - -function editablefields_html() -{ - $nid=arg(1); - $field=arg(2); - $node=node_load($nid); - if (node_access("update",$node)) { - - // $html=_editablefields_create_form($node,$field); - $html=drupal_get_form('editablefields_form',$node,$field); - +/** + * Menu callback: ajax form. + */ +function editablefields_html() { + $nid = arg(1); + $field = arg(2); + $node = node_load($nid); + if (node_access('update', $node)) { + // $html = _editablefields_create_form($node, $field); + $html = drupal_get_form('editablefields_form', $node, $field); $object = new StdClass(); $object->content = $html; // Register the JavaScript callback for this module. @@ -134,49 +138,43 @@ function editablefields_html() // Allow other modules to extend the data returned. drupal_alter('ajax_data', $object, 'editablefields', $html); drupal_json($object); - - } else { + } + else { drupal_not_found(); } exit(); } - -function editablefields_submit()//$form, &$form_state) -{ - - $nid=$_POST["nid"]; - $node=node_load($nid); - - if (node_access("update",$node)) { - $form_state=array('values'=>$_POST); - foreach ($_POST as $field=>$value) { +/** + * Menu callback: ajax submit. + */ +function editablefields_submit() { + $nid = $_POST['nid']; + $node = node_load($nid); + + if (node_access('update', $node)) { + $form_state = array('values' => $_POST); + foreach ($_POST as $field => $value) { if (is_array($node->{$field})) { - $err=drupal_execute('editablefields_form',$form_state,$node,$field); + $err = drupal_execute('editablefields_form', $form_state, $node, $field); if ($err) { drupal_set_header('HTTP/1.1 404 Not Found'); - print (t("Error handling submition").$err); + print t('Error handling submition') . $err; exit(); } - if ($node->{$field} != $form_state['values'][$field]) { $node->{$field} = $form_state['values'][$field]; - $update=1; + $update = 1; } } } if ($update) { node_save($node); } - } else { + } + else { drupal_set_header('HTTP/1.1 404 Not Found'); - print "No write permissions for $field"; + print t('No write permissions for %field', array('%field' => $field)); } - - exit(); } - - - -?> --- editablefields.js.old 2008-12-31 12:48:16.000000000 +0100 +++ editablefields.js 2008-12-31 12:53:41.000000000 +0100 @@ -1,73 +1,70 @@ +// $Id$ editablefields = function() { $('div.editablefields').not('.noonload').each(function() { - $(this).children().css( 'opacity', '0.3' ); - editablefieldsload(this,"?q=/editablefields_html/"+$(this).attr("nid")+"/"+$(this).attr("field")); - }); - - + $(this).children().css('opacity', '0.3'); + editablefieldsload(this, "?q=/editablefields_html/" + $(this).attr("nid") + "/" + $(this).attr("field")); + }); $('div.editablefields').change(editablefieldschanger); $('div.editablefields').submit(editablefieldschanger); }; - + var updateValue; -editablefieldsupdater = function(element) -{ +editablefieldsupdater = function(element) { var nid=$(element).attr("nid"); - $(element).children().css( 'opacity', '0.3' ); - + $(element).children().css('opacity', '0.3'); $.ajax({ - type: "POST", - url: "?q=/editablefields_submit", - data: $(element).find('form').serialize()+"&nid="+nid, - element: $(element), - success: function(msg){ - updateValue=0; - editablefieldsload($(this.element),"?q=/editablefields_html/"+$(this.element).attr("nid")+"/"+$(this.element).attr("field")); - }, - error: function(msg){ - alert( "Error, unable to make update: " + msg.responseText ); - } - }); + type: "POST", + url: "?q=/editablefields_submit", + data: $(element).find('form').serialize()+"&nid="+nid, + element: $(element), + success: function(msg) { + updateValue = 0; + editablefieldsload($(this.element), "?q=/editablefields_html/" + $(this.element).attr("nid") + "/" + $(this.element).attr("field")); + }, + error: function(msg) { + alert( "Error, unable to make update: " + msg.responseText); + } + }); }; -editablefieldsload = function( e, url) -{ +editablefieldsload = function(e, url) { $(e).ajaxSubmit({ - url: url, - type: 'GET', - success: function(response) { - // Call all callbacks. - if (response.__callbacks) { - $.each(response.__callbacks, function(i, callback) { - eval(callback)(e, response); -// alert(response.scripts.inline); - }); - } - $(e).html(response.content); - $(e).find(':input').change(editablefieldschanger); - $(e).find(':input').submit(editablefieldschanger); - }, - error: function(response) { alert(Drupal.t("An error occurred at ") + url ); }, - dataType: 'json' - }); + url: url, + type: 'GET', + success: function(response) { + // Call all callbacks. + if (response.__callbacks) { + $.each(response.__callbacks, function(i, callback) { + eval(callback)(e, response); +// alert(response.scripts.inline); + }); + } + $(e).html(response.content); + $(e).find(':input').change(editablefieldschanger); + $(e).find(':input').submit(editablefieldschanger); + }, + error: function(response) { + alert(Drupal.t("An error occurred at ") + url); + }, + dataType: 'json' + }); } -editablefieldschanger = function() -{ +editablefieldschanger = function() { var t=this; - - if (! $(this).hasClass('editablefields') ) { - t=$(this).parents('div.editablefields'); + + if (!$(this).hasClass('editablefields')) { + t = $(this).parents('div.editablefields'); } - newValue=$(t).find('form').serialize(); - if (newValue!=updateValue) { - updateValue=newValue; + newValue = $(t).find('form').serialize(); + if (newValue != updateValue) { + updateValue = newValue; editablefieldsupdater($(t)); } - return false;// dont actually submit + return false; // dont actually submit }; if (Drupal.jsEnabled) {