[Vtigercrm-commits] [vtiger-commits] r9849 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl Smarty/templates/Inventory/InventoryDetailView.tpl include/Ajax/TagCloud.php include/freetag/freetag.class.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Thu Nov 16 08:04:55 2006
New Revision: 9849

Log:
removal of tag at Entity complety removes tag - fixed . Fixes #2266

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php
    vtigercrm/branches/5.0.3/include/freetag/freetag.class.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Thu Nov 16 08:04:55 2006
@@ -54,7 +54,7 @@
 		return false;
 	{rdelim}
 {rdelim}
-function DeleteTag(id)
+function DeleteTag(id,recordid)
 {ldelim}
 	$("vtbusy_info").style.display="inline";
 	Effect.Fade('tag_'+id);
@@ -62,7 +62,7 @@
 		'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&recordid="+recordid+"&tagid=" +id,
                         onComplete: function(response) {ldelim}
 						getTagCloud();
 						$("vtbusy_info").style.display="none";

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Thu Nov 16 08:04:55 2006
@@ -29,7 +29,7 @@
 		return false;
 	{rdelim}
 {rdelim}
-function DeleteTag(id)
+function DeleteTag(id,recordid)
 {ldelim}
 	$("vtbusy_info").style.display="inline";
 	Effect.Fade('tag_'+id);
@@ -37,7 +37,7 @@
 		'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&recordid="+recordid+"&tagid=" +id,
                         onComplete: function(response) {ldelim}
 						getTagCloud();
 						$("vtbusy_info").style.display="none";

Modified: vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php (original)
+++ vtigercrm/branches/5.0.3/include/Ajax/TagCloud.php Thu Nov 16 08:04:55 2006
@@ -46,10 +46,10 @@
 	{
 		$tagid = $_REQUEST['tagid']; 
 		global $adb;
-		$query="delete from vtiger_freetagged_objects where tag_id=".$tagid;
+		$query="delete from vtiger_freetagged_objects where tag_id=".$tagid." and object_id=".$crmid;
 		$result=$adb->query($query);
-		$query="delete from vtiger_freetags where id=".$tagid;
-		$result=$adb->query($query);
+		/*$query="delete from vtiger_freetags where id=".$tagid;
+		$result=$adb->query($query);*/
 		echo 'SUCESS';
 	}else
 	{

Modified: vtigercrm/branches/5.0.3/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/freetag/freetag.class.php (original)
+++ vtigercrm/branches/5.0.3/include/freetag/freetag.class.php Thu Nov 16 08:04:55 2006
@@ -923,9 +923,9 @@
 		{	
 			foreach($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * 3;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
-
-			}
+				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].','.$obj_id.');"><img src="'.$image_path.'del_tag.gif"></span></span>';
+
+		}
 		}else
 		{
 			foreach($tag_list[0] as $tag => $qty) {