From 7407148f042420cb40e0cb4e6f8b321899541442 Mon Sep 17 00:00:00 2001
From: Ryan Peters <rjpeter2@gmail.com>
Date: Fri, 4 May 2012 20:47:16 -0500
Subject: [PATCH] Issue #1388220: Actions Missing in My Edits

---
 views/workbench_edited.view.inc |   63 +++++++++++++++-----------------------
 workbench.module                |   10 ++++++
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/views/workbench_edited.view.inc b/views/workbench_edited.view.inc
index 61168ad..f4af965 100644
--- a/views/workbench_edited.view.inc
+++ b/views/workbench_edited.view.inc
@@ -170,26 +170,6 @@ $handler->display->display_options['fields']['status']['alter']['html'] = 0;
 $handler->display->display_options['fields']['status']['hide_empty'] = 0;
 $handler->display->display_options['fields']['status']['empty_zero'] = 0;
 $handler->display->display_options['fields']['status']['not'] = 0;
-/* Field: User: Name */
-$handler->display->display_options['fields']['name']['id'] = 'name';
-$handler->display->display_options['fields']['name']['table'] = 'users';
-$handler->display->display_options['fields']['name']['field'] = 'name';
-$handler->display->display_options['fields']['name']['relationship'] = 'uid';
-$handler->display->display_options['fields']['name']['label'] = 'Revised by';
-$handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-$handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
-$handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
-$handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
-$handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
-$handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-$handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-$handler->display->display_options['fields']['name']['alter']['html'] = 0;
-$handler->display->display_options['fields']['name']['element_label_colon'] = 1;
-$handler->display->display_options['fields']['name']['element_default_classes'] = 1;
-$handler->display->display_options['fields']['name']['hide_empty'] = 0;
-$handler->display->display_options['fields']['name']['empty_zero'] = 0;
-$handler->display->display_options['fields']['name']['link_to_user'] = 1;
-$handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
 /* Field: Content: Updated date */
 $handler->display->display_options['fields']['changed']['id'] = 'changed';
 $handler->display->display_options['fields']['changed']['table'] = 'node';
@@ -208,24 +188,31 @@ $handler->display->display_options['fields']['changed']['element_default_classes
 $handler->display->display_options['fields']['changed']['hide_empty'] = 0;
 $handler->display->display_options['fields']['changed']['empty_zero'] = 0;
 $handler->display->display_options['fields']['changed']['date_format'] = 'time ago';
-/* Field: Content: Edit link */
-$handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
-$handler->display->display_options['fields']['edit_node']['table'] = 'node';
-$handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-$handler->display->display_options['fields']['edit_node']['label'] = 'Actions';
-$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
-$handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
-$handler->display->display_options['fields']['edit_node']['element_label_colon'] = 1;
-$handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
-$handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
-$handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
-$handler->display->display_options['fields']['edit_node']['text'] = 'edit';
+/* Field: Content: Nid */
+$handler->display->display_options['fields']['nid_1']['id'] = 'nid_1';
+$handler->display->display_options['fields']['nid_1']['table'] = 'node';
+$handler->display->display_options['fields']['nid_1']['field'] = 'nid';
+$handler->display->display_options['fields']['nid_1']['label'] = 'Actions';
+$handler->display->display_options['fields']['nid_1']['alter']['alter_text'] = 1;
+$handler->display->display_options['fields']['nid_1']['alter']['text'] = '<a href="/node/[nid_1]/edit?destination=admin/workbench">edit</a>';
+$handler->display->display_options['fields']['nid_1']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['absolute'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['external'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['replace_spaces'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['trim_whitespace'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['nl2br'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['nid_1']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['nid_1']['alter']['more_link'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['nid_1']['alter']['html'] = 0;
+$handler->display->display_options['fields']['nid_1']['element_label_colon'] = 1;
+$handler->display->display_options['fields']['nid_1']['element_default_classes'] = 1;
+$handler->display->display_options['fields']['nid_1']['hide_empty'] = 0;
+$handler->display->display_options['fields']['nid_1']['empty_zero'] = 0;
+$handler->display->display_options['fields']['nid_1']['hide_alter_empty'] = 1;
+$handler->display->display_options['fields']['nid_1']['link_to_node'] = 0;
 /* Sort criterion: Content: Updated date */
 $handler->display->display_options['sorts']['changed']['id'] = 'changed';
 $handler->display->display_options['sorts']['changed']['table'] = 'node';
diff --git a/workbench.module b/workbench.module
index 6b9646d..2f8e101 100644
--- a/workbench.module
+++ b/workbench.module
@@ -200,6 +200,16 @@ function workbench_preprocess_views_view_field(&$variables) {
 }
 
 /**
+ * Implements hook_views_query_alter().
+ */
+function workbench_views_query_alter(&$view, &$query) {
+  // This is needed to remove duplicates from the My Edits view.
+  if ($view->name == 'workbench_edited') {
+    unset($query->fields['vid']);
+  }
+}
+
+/**
  * Implements hook_ctools_plugin_directory() to let the system know
  * where our task and task_handler plugins are.
  */
-- 
1.7.1