From 8c975b5f46b3b3173e43203a3b5919345e8dbc20 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 21 Aug 2014 14:42:17 +0000
Subject: [PATCH] Hide info_link in addressbook CRM view via CSS, and try to
 not filter them by query in infolog get_rows . -Fix clicking on linked
 infolog entry and redirecting to AB CRM view removes the link from the row in
 infolog

---
 addressbook/templates/default/app.css  | 3 +++
 addressbook/templates/pixelegg/app.css | 3 +++
 infolog/inc/class.infolog_ui.inc.php   | 2 +-
 infolog/templates/default/index.xet    | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index 6691ff62af..1b27697820 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -94,4 +94,7 @@ img.iphoto {
 }
 #addressbook-edit_room {
 	float:right;
+}
+.addressbookHooked .egwGridView_grid label>span.et2_link {
+	display: none;
 }
\ No newline at end of file
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 7a704ad62b..02e48057be 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -115,6 +115,9 @@ img.iphoto {
 #addressbook-edit_room {
   float: right;
 }
+.addressbookHooked .egwGridView_grid label > span.et2_link {
+  display: none;
+}
 @media all {
   /* #############################################################################
 
diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 221e3fe56a..2500a4c2a5 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -436,7 +436,7 @@ class infolog_ui
 			{
 				$info['links'] =& $links[$id];
 				$info['info_anz_subs'] = (int)$anzSubs[$id];
-				$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],false,$details);
+				$info = $this->get_info($info,$readonlys,null,null,false,$details);
 			}
 			// for subs view ('sp') add parent(s) in front of subs once(!)
 			if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 33ac40d769..91ddb5a67d 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -162,7 +162,7 @@
 					<template id="dates"/>
 					<template id="header_right"/>
 				</row>
-				<row>
+				<row class="$cont[action]Hooked">
 					<nextmatch id="nm" template="infolog.index.rows" span="all"/>
 				</row>
 				<row>