[CS-Project-svn_notify] SF.net SVN: cs-project: [869] releases/1.1

[<cra...@us...>]

Revision: 869
          http://cs-project.svn.sourceforge.net/cs-project/?rev=869&view=rev
Author:   crazedsanity
Date:     2008-03-30 19:21:56 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
 *** RELEASE 1.1.5 ***

Add ancestry link list to issue title (issue #146), plus remove wrapping from 
send_single_email() so wrapping isn't terrible.

SVN COMMAND:::
merge -r866:868 https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/1.1

Modified Paths:
--------------
    releases/1.1/VERSION
    releases/1.1/lib/bbCodeParser.class.php
    releases/1.1/lib/globalFunctions.php
    releases/1.1/templates/email/helpdesk-remark.tmpl

Modified: releases/1.1/VERSION
===================================================================
--- releases/1.1/VERSION	2008-03-31 02:19:47 UTC (rev 868)
+++ releases/1.1/VERSION	2008-03-31 02:21:56 UTC (rev 869)
@@ -1,4 +1,4 @@
 $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $
 
-VERSION: 1.1.4
+VERSION: 1.1.5
 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $

Modified: releases/1.1/lib/bbCodeParser.class.php
===================================================================
--- releases/1.1/lib/bbCodeParser.class.php	2008-03-31 02:19:47 UTC (rev 868)
+++ releases/1.1/lib/bbCodeParser.class.php	2008-03-31 02:21:56 UTC (rev 869)
@@ -69,8 +69,18 @@
 		$retval = '[helpdesk_id='. $helpdeskId .']';
 		if(is_numeric($helpdeskId)) {
 			try {
-			$data = $this->helpdeskObj->get_record($helpdeskId);
-			$retval = '&#91;<a href="http://'. PROJECT_URL .'/content/helpdesk/view?ID='. $helpdeskId .'">'. $data['name'] .'</a>&#93;';
+				$data = $this->helpdeskObj->get_record($helpdeskId);
+				$displayName = $data['name'];
+				
+				//add project linkage if there is any...
+				if($data['ancestry_level'] > 1) {
+					//pull the ancestry string.
+					$parentRecord = $this->projectObj->get_parent_record($data['ancestry']);
+					$x = $this->projectObj->get_ancestry_link_list($parentRecord['public_id'], TRUE, TRUE, TRUE);
+					$displayName = $x .' / <b>'. $displayName ."</b>";
+				}
+				
+				$retval = '&#91;<a href="http://'. PROJECT_URL .'/content/helpdesk/view?ID='. $helpdeskId .'">'. $displayName .'</a>&#93;';
 			}
 			catch(exception $e) {
 				debug_print($e->getMessage);

Modified: releases/1.1/lib/globalFunctions.php
===================================================================
--- releases/1.1/lib/globalFunctions.php	2008-03-31 02:19:47 UTC (rev 868)
+++ releases/1.1/lib/globalFunctions.php	2008-03-31 02:21:56 UTC (rev 869)
@@ -1756,7 +1756,6 @@
 	$mail->ContentType = "text/html";
 	$mail->Subject = $subject;
 	$mail->Body = $bbCodeParser->parseString($body);
-	$mail->WordWrap = 75;
 	
 	$logsObj = new logsClass($db, 'Email');
 	

Modified: releases/1.1/templates/email/helpdesk-remark.tmpl
===================================================================
--- releases/1.1/templates/email/helpdesk-remark.tmpl	2008-03-31 02:19:47 UTC (rev 868)
+++ releases/1.1/templates/email/helpdesk-remark.tmpl	2008-03-31 02:21:56 UTC (rev 869)
@@ -12,7 +12,7 @@
 </tr>
 <tr>
 	<th>Name of Issue:</th>
-	<td><pre>{name}</pre></td>
+	<td><pre>[helpdesk_id={public_id}]</pre></td>
 </tr>
 <tr>
 	<th>Submitted by:</th>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.