From 45a709cc62b147b37c4da6013b11946351733761 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 27 Feb 2014 21:27:14 +0000 Subject: [PATCH] Remove legacy action columns & associated readonlys --- .../inc/class.importexport_definitions_bo.inc.php | 2 +- .../inc/class.importexport_definitions_ui.inc.php | 3 ++- importexport/templates/default/definition_index.xet | 10 ---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/importexport/inc/class.importexport_definitions_bo.inc.php b/importexport/inc/class.importexport_definitions_bo.inc.php index 312e8099a2..15864e6cc2 100644 --- a/importexport/inc/class.importexport_definitions_bo.inc.php +++ b/importexport/inc/class.importexport_definitions_bo.inc.php @@ -70,7 +70,7 @@ class importexport_definitions_bo { !$GLOBALS['egw_info']['user']['apps']['admin']; if($readonlys["edit[{$row['definition_id']}]"]) { - $row['class'] .= 'rowNoEdit'; + $row['class'] .= 'rowNoEdit rowNoDelete'; $ro_count++; } $row['class'] .= ' ' . $row['type']; diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index 107ac4a58e..a2e62ed757 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -435,7 +435,8 @@ class importexport_definitions_ui $rows = array(); egw_session::appsession('index','importexport',$query); $bodefinitions = new importexport_definitions_bo($query['col_filter'], true); - return $bodefinitions->get_rows($query, $rows, $readonlys); + // We don't care about readonlys for the UI + return $bodefinitions->get_rows($query, $rows, $discard); } /** diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet index 9a6add1789..8515d4ff31 100644 --- a/importexport/templates/default/definition_index.xet +++ b/importexport/templates/default/definition_index.xet @@ -19,11 +19,6 @@ - - -