0.3.15

CHANGELOG

@@ -5,6 +5,7 @@ ChangeLog for PatchCableMgr
 ****************************************************
 
 Contents
+	- Changes Introduced In 0.3.15
 	- Changes Introduced In 0.3.14
 	- Changes Introduced In 0.3.13
 	- Changes Introduced In 0.3.12
@@ -33,6 +34,9 @@ Contents
 ****************************************************
 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
+**Changes introduced in 0.3.15
+[Fix]		HTML code for hyphens not converted when viewing floorplan object details
+
 **Changes introduced in 0.3.14
 [Enhance]	Added support for point-to-multipoint connections to represent breakout cables
 [Fix]		Broken template image upload

backend/retrieve_floorplan_object_details.php

@@ -19,15 +19,10 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
 		$objectID = $data['objectID'];
 		
 		$floorplanObject = $qls->App->objectArray[$objectID];
+		$floorplanObjectName = $qls->App->unConvertHyphens($floorplanObject['name']);
 		$floorplanObjectTemplateID = $floorplanObject['template_id'];
 		$floorplanObjectTemplate = $qls->App->templateArray[$floorplanObjectTemplateID];
 		
-		$peerArray = array();
-		$query = $qls->SQL->select('*', 'app_object_peer', array('a_id' => array('=', $objectID)));
-		while($row = $qls->SQL->fetch_assoc($query)) {
-			array_push($peerArray, $row);
-		}
-		
 		$type = $floorplanObjectTemplate['templateType'];
 		$trunkable = $qls->App->floorplanObjDetails[$type]['trunkable'];
 		$peerIDArray = array();
@@ -68,7 +63,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
 		}
 		
 		$returnData = array(
-			'name' => $floorplanObject['name'],
+			'name' => $floorplanObjectName,
 			'trunkable' => $trunkable,
 			'peerIDArray' => $peerIDArray,
 			'objPortArray' => $objPortArray,

includes/Update.class.php

@@ -102,6 +102,8 @@ var $qls;
 			$this->update_0312_to_0313();
 		} else if($this->currentVersion == '0.3.13') {
 			$this->update_0313_to_0314();
+		} else if($this->currentVersion == '0.3.14') {
+			$this->update_0314_to_0315();
 		} else {
 			return true;
 		}
@@ -110,6 +112,18 @@ var $qls;
 		return false;
 	}
 	
+	/**
+	 * Update from version 0.3.14 to 0.3.15
+	 * @return Boolean
+	 */
+	function update_0314_to_0315() {
+		$incrementalVersion = '0.3.15';
+		
+		// Set app version to 0.3.15
+		$this->qls->SQL->update('app_organization_data', array('version' => $incrementalVersion), array('id' => array('=', 1)));
+		
+	}
+	
 	/**
 	 * Update from version 0.3.13 to 0.3.14
 	 * @return Boolean

includes/definitions.php

@@ -3,7 +3,7 @@
 define('AVAILABLE_CABLE_END_ID_COUNT', 100);
 define('MAX_WALLJACK_PORTID', 100);
 define('DEFAULT_FLOORPLAN_IMG', 'floorplan-default.png');
-define('PCM_VERSION', '0.3.14');
+define('PCM_VERSION', '0.3.15');
 
 define('NEW_OBJECT_PREFIX', 'Object_');
 define('NEW_LOCATION_PREFIX', 'Location_');

install/Install.class.php

@@ -37,7 +37,7 @@ class Install {
  * @var string $system_version - The version of the system
  */
 var $system_version = '3.1.11';
-var $app_version = '0.3.14';
+var $app_version = '0.3.15';
 
 /**
  * @var string $install_error - Contains the installation error