? .git
? tests
? help/localization.html
? plugins/views_plugin_localization.inc
? plugins/views_plugin_localization_core.inc
? plugins/views_plugin_localization_none.inc
Index: modules/node.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node.views.inc,v
retrieving revision 1.93.2.6
diff -u -p -r1.93.2.6 node.views.inc
--- modules/node.views.inc 2 Nov 2009 23:25:10 -0000 1.93.2.6
+++ modules/node.views.inc 23 Dec 2009 21:57:14 -0000
@@ -656,7 +656,7 @@ function node_views_handlers() {
'parent' => 'views_handler_field_node',
),
'views_handler_field_node_link' => array(
- 'parent' => 'views_handler_field',
+ 'parent' => 'views_handler_field_node',
),
'views_handler_field_node_type' => array(
'parent' => 'views_handler_field_node',
Index: modules/node/views_handler_field_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node.inc,v
retrieving revision 1.3.2.5
diff -u -p -r1.3.2.5 views_handler_field_node.inc
--- modules/node/views_handler_field_node.inc 10 Nov 2009 23:20:06 -0000 1.3.2.5
+++ modules/node/views_handler_field_node.inc 23 Dec 2009 21:57:14 -0000
@@ -12,6 +12,7 @@ class views_handler_field_node extends v
function init(&$view, $options) {
parent::init($view, $options);
+ $this->real_field = 'nid';
if (!empty($this->options['link_to_node'])) {
$this->additional_fields['nid'] = 'nid';
if (module_exists('translation')) {
Index: modules/node/views_handler_field_node_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_field_node_link.inc
--- modules/node/views_handler_field_node_link.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_field_node_link.inc 23 Dec 2009 21:57:15 -0000
@@ -3,37 +3,14 @@
/**
* Field handler to present a link to the node.
*/
-class views_handler_field_node_link extends views_handler_field {
- function construct() {
- parent::construct();
- $this->additional_fields['nid'] = 'nid';
- }
+class views_handler_field_node_link extends views_handler_field_node {
function option_definition() {
$options = parent::option_definition();
-
- $options['text'] = array('default' => '', 'translatable' => TRUE);
+ $options['link_to_node'] = array('default' => TRUE);
+ $options['alter']['contains']['alter_text'] = array('default' => TRUE);
+ $options['alter']['contains']['text'] = array('default' => 'Link', 'translatable' => TRUE);
return $options;
}
-
- function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
- $form['text'] = array(
- '#type' => 'textfield',
- '#title' => t('Text to display'),
- '#default_value' => $this->options['text'],
- );
- }
-
- function query() {
- $this->ensure_my_table();
- $this->add_additional_fields();
- }
-
- function render($values) {
- $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
- $nid = $values->{$this->aliases['nid']};
- return l($text, "node/$nid");
- }
}
Index: modules/node/views_handler_field_node_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link_delete.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_field_node_link_delete.inc
--- modules/node/views_handler_field_node_link_delete.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_field_node_link_delete.inc 23 Dec 2009 21:57:15 -0000
@@ -11,6 +11,12 @@ class views_handler_field_node_link_dele
$this->additional_fields['format'] = array('table' => 'node_revisions', 'field' => 'format');
}
+ function option_definition() {
+ $options = parent::option_definition();
+ $options['alter']['contains']['text'] = array('default' => 'Delete', 'translatable' => TRUE);
+ return $options;
+ }
+
function render($values) {
// ensure user has access to edit this node.
$node = new stdClass();
@@ -23,8 +29,20 @@ class views_handler_field_node_link_dele
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
- return l($text, "node/$node->nid/delete", array('query' => drupal_get_destination()));
+ return parent::render($values);
+ }
+
+ /**
+ * Render whatever the data is as a link to the node.
+ *
+ * Data should be made XSS safe prior to calling this function.
+ */
+ function render_link($data, $values) {
+ if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
+ parent::render_link($data, $values);
+ $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']} . "/delete";
+ }
+ return $data;
}
}
Index: modules/node/views_handler_field_node_link_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_link_edit.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_field_node_link_edit.inc
--- modules/node/views_handler_field_node_link_edit.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_field_node_link_edit.inc 23 Dec 2009 21:57:15 -0000
@@ -11,6 +11,12 @@ class views_handler_field_node_link_edit
$this->additional_fields['format'] = array('table' => 'node_revisions', 'field' => 'format');
}
+ function option_definition() {
+ $options = parent::option_definition();
+ $options['alter']['contains']['text'] = array('default' => 'Edit', 'translatable' => TRUE);
+ return $options;
+ }
+
function render($values) {
// ensure user has access to edit this node.
$node = new stdClass();
@@ -23,8 +29,20 @@ class views_handler_field_node_link_edit
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
- return l($text, "node/$node->nid/edit", array('query' => drupal_get_destination()));
+ return parent::render($values);
+ }
+
+ /**
+ * Render whatever the data is as a link to the node.
+ *
+ * Data should be made XSS safe prior to calling this function.
+ */
+ function render_link($data, $values) {
+ if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
+ parent::render_link($data, $values);
+ $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']} . "/edit";
+ }
+ return $data;
}
}
Index: modules/node/views_handler_field_node_revision_link_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_revision_link_delete.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_field_node_revision_link_delete.inc
--- modules/node/views_handler_field_node_revision_link_delete.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_field_node_revision_link_delete.inc 23 Dec 2009 21:57:15 -0000
@@ -32,7 +32,19 @@ class views_handler_field_node_revision_
if ($node->vid == $values->{$this->aliases['node_vid']}) {
return;
}
- $text = !empty($this->options['text']) ? $this->options['text'] : t('delete');
- return l($text, "node/$node->nid/revisions/$node->vid/delete", array('query' => drupal_get_destination()));
+ return parent::render($values);
+ }
+
+ /**
+ * Render whatever the data is as a link to the node.
+ *
+ * Data should be made XSS safe prior to calling this function.
+ */
+ function render_link($data, $values) {
+ if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
+ parent::render_link($data, $values);
+ $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']} . "/revisions/" . $values->{$this->aliases['vid']} . "/delete";
+ }
+ return $data;
}
}
Index: modules/node/views_handler_field_node_revision_link_revert.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node/views_handler_field_node_revision_link_revert.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_handler_field_node_revision_link_revert.inc
--- modules/node/views_handler_field_node_revision_link_revert.inc 3 Sep 2008 19:21:29 -0000 1.1
+++ modules/node/views_handler_field_node_revision_link_revert.inc 23 Dec 2009 21:57:15 -0000
@@ -32,8 +32,20 @@ class views_handler_field_node_revision_
if ($node->vid == $values->{$this->aliases['node_vid']}) {
return;
}
+ return parent::render($values);
+ }
- $text = !empty($this->options['text']) ? $this->options['text'] : t('revert');
- return l($text, "node/$node->nid/revisions/$node->vid/revert", array('query' => drupal_get_destination()));
+ /**
+ * Render whatever the data is as a link to the node.
+ *
+ * Data should be made XSS safe prior to calling this function.
+ */
+ function render_link($data, $values) {
+ if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
+ parent::render_link($data, $values);
+ $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']} . "/revisions/" . $values->{$this->aliases['vid']} . "/revert";
+ }
+ return $data;
}
+
}