From debcd059bcef4f875757e256583eb13b932b2602 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 8 May 2012 17:27:38 +0000
Subject: [PATCH] Remove action column - no action columns in et2

---
 etemplate/js/et2_extension_nextmatch.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 6309afc407..a2e1798325 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -393,6 +393,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], {
 					if(columnDisplay[j] == colName)
 					{
 						_colData[i].disabled = negated;
+
 						continue RowLoop;
 					}
 				}
@@ -485,6 +486,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], {
 				"widget": _row[x].widget
 			};
 
+
 			columnData[x] = {
 				"id": "col_" + x,
 				"caption": this._genColumnCaption(_row[x].widget),
@@ -493,6 +495,16 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput], {
 				"width": _colData[x].width
 			};
 
+			// No action columns in et2
+			var colName = this._getColumnName(_row[x].widget);
+			if(colName == 'actions' || colName == 'legacy_actions' || colName == 'legacy_actions_check_all') 
+			{
+				this.columns.splice(x,x);
+				columnData.splice(x,x);
+				_colData.splice(x,x);
+				continue;
+			}
+
 			// Append the widget to this container
 			this.addChild(_row[x].widget);
 		}