Cleanup

1. New version of release database. 2. Content id not being set correctly, now fetch content type by content id.
Dlayer · Mar 18, 2015 · f67794d · f67794d
1 parent 4c45b64
commit f67794d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/application/modules/content/controllers/ProcessController.php b/application/modules/content/controllers/ProcessController.php
@@ -202,7 +202,8 @@ public function autoToolAction()
 						break;
 
 					case 'content_id':
-						$this->session_content->setContentId($id['id'], 'heading');
+						$this->session_content->setContentId($id['id'], 
+							$id['content_type']);
 						break;
 
 					default:

diff --git a/library/Dlayer/Model/Page/Content.php b/library/Dlayer/Model/Page/Content.php
@@ -841,4 +841,36 @@ public function contentRowDivId($site_id, $page_id, $content_row_id)
 			return FALSE;
 		}
 	}
+
+	/**
+	* Fetch the content type by the content id
+	* 
+	* @param integer $site_id
+	* @param integer $page_id
+	* @param integer $content_id
+	* @return string|FALSE Content type for given content id
+	*/
+	public function contentTypeByContentId($site_id, $page_id, $content_id) 
+	{
+		$sql = 'SELECT dct.`name` 
+				FROM user_site_page_content_item uspci 
+				JOIN designer_content_type dct 
+					ON uspci.content_type = dct.id 
+				WHERE uspci.site_id = :site_id 
+				AND uspci.page_id = :page_id 
+				AND uspci.id = :content_id';
+		$stmt = $this->_db->prepare($sql);
+		$stmt->bindValue(':site_id', $site_id, PDO::PARAM_INT);
+		$stmt->bindValue(':page_id', $page_id, PDO::PARAM_INT);
+		$stmt->bindValue(':content_id', $content_id, PDO::PARAM_INT);
+		$stmt->execute();
+
+		$result = $stmt->fetch();
+
+		if($result != FALSE) {
+			return $result['name'];
+		} else {
+			return FALSE;
+		}
+	}
 }
diff --git a/library/Dlayer/Tool/Content/MoveItem.php b/library/Dlayer/Tool/Content/MoveItem.php
@@ -114,11 +114,15 @@ protected function structure($site_id, $page_id, $div_id,
 			$this->params_auto['content_row_id'], 
 			$this->params_auto['content_id']);
 
+		$content_type = $model_page_content->contentTypeByContentId($site_id, 
+			$page_id, $this->params_auto['content_id']);
+
 		/**
 		* Only return the array to set environment properties if the div id 
-		* can be selected for the content row
+		* can be selected for the new content row and the content type is 
+		* returned for the content id
 		*/
-		if($new_div_id != FALSE) {
+		if($new_div_id != FALSE && $content_type != FALSE) {
 			return array(
 				array(
 					'type'=>'div_id', 
@@ -130,7 +134,8 @@ protected function structure($site_id, $page_id, $div_id,
 				),
 				array(
 					'type'=>'content_id', 
-					'id'=>$this->params_auto['content_id']
+					'id'=>$this->params_auto['content_id'], 
+					'content_type'=>$content_type
 				),
 			);
 		} else {

diff --git a/private/database/release-database.sql b/private/database/release-database.sql