From 2b8e83afc2528058b38e1b5e9bc6c29037c38bc9 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 17 Jan 2012 14:46:37 +0100
Subject: [PATCH] now we can delete course descriptions by id not by
 description type BT#3468

---
 .../course_description_controller.php            | 16 +++++++++-------
 main/course_description/edit.php                 |  5 +++--
 .../classes/CourseDescription.class.php          |  9 +++------
 main/inc/lib/course_description.lib.php          |  1 +
 4 files changed, 16 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 main/coursecopy/classes/CourseDescription.class.php

diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index 1c20ca0a4d..4fda7eb97c 100644
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -80,10 +80,13 @@ class CourseDescriptionController { // extends Controller {
 					$course_description->set_description_type($description_type);
 		    		$course_description->set_title($title);
 		    		$course_description->set_content($content);
+                    
 		    		$course_description->set_progress($progress);                   
 		           			        		
 		        	$thematic_advance = $course_description->get_data_by_id($id);			        		        		
+                    
                     if (!empty($thematic_advance)) {		   		        			
+                        $course_description->set_id($id);
                         $affected_rows = $course_description->update();	        			
                     } else {
                         $affected_rows = $course_description->insert();
@@ -128,13 +131,12 @@ class CourseDescriptionController { // extends Controller {
 				if (isset($_GET['id_session'])) {
 					$session_id = intval($_GET['id_session']);
 				}				
-        		$course_description_data = $course_description->get_data_by_id($id, null, $session_id);        		        		
-            
-				$data['description_title'] = $course_description_data['description_title'];
-        		$data['description_content'] = $course_description_data['description_content'];
-        		
-        		$data['progress'] = $course_description_data['progress'];        		
-        		$data['descriptions'] = $course_description->get_data_by_description_type($description_type, null, $session_id);
+        		$course_description_data        = $course_description->get_data_by_id($id, null, $session_id);        		        		
+                $data['description_type']       = $course_description_data['description_type'];
+				$data['description_title']      = $course_description_data['description_title'];
+        		$data['description_content']    = $course_description_data['description_content'];        		
+        		$data['progress']               = $course_description_data['progress'];        		
+        		$data['descriptions']           = $course_description->get_data_by_description_type($description_type, null, $session_id);
         	}
         	// render to the view        					
 			$this->view->set_data($data);
diff --git a/main/course_description/edit.php b/main/course_description/edit.php
index df8059976f..19c918811c 100644
--- a/main/course_description/edit.php
+++ b/main/course_description/edit.php
@@ -9,6 +9,7 @@
 
 // protect a course script
 api_protect_course_script(true);
+$original_id = $id;
 
 if (!$error) {
 	$token = Security::get_token();
@@ -49,10 +50,10 @@ if ($description_type >= ADD_BLOCK) {
 }
 
 // display form
-$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$id.'&description_type='.$description_type.'&'.api_get_cidreq(),'','style="width: 100%;"');
+$form = new FormValidator('course_description','POST','index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq(),'','style="width: 100%;"');
 
 $form->addElement('header','',$header);
-$form->addElement('hidden', 'id', $id);
+$form->addElement('hidden', 'id', $original_id);
 $form->addElement('hidden', 'description_type',$description_type);
 $form->addElement('hidden', 'sec_token',$token);
 $form->add_textfield('title', get_lang('Title'), true, array('size'=>'50'));
diff --git a/main/coursecopy/classes/CourseDescription.class.php b/main/coursecopy/classes/CourseDescription.class.php
old mode 100755
new mode 100644
index e483eb72a6..8401cc23cf
--- a/main/coursecopy/classes/CourseDescription.class.php
+++ b/main/coursecopy/classes/CourseDescription.class.php
@@ -28,8 +28,7 @@ class CourseDescription extends Resource
 	 * @param string $title
 	 * @param string $content
 	 */
-	function CourseDescription($id,$title,$content,$description_type)
-	{
+	function __construct($id,$title,$content,$description_type) {
 		parent::Resource($id,RESOURCE_COURSEDESCRIPTION);
 		$this->title = $title;
 		$this->content = $content;
@@ -38,10 +37,8 @@ class CourseDescription extends Resource
 	/**
 	 * Show this Event
 	 */
-	function show()
-	{
+	function show() {
 		parent::show();
 		echo $this->title;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/main/inc/lib/course_description.lib.php b/main/inc/lib/course_description.lib.php
index e7f6eda403..c6190e3a25 100644
--- a/main/inc/lib/course_description.lib.php
+++ b/main/inc/lib/course_description.lib.php
@@ -158,6 +158,7 @@ class CourseDescription
 		$rs = Database::query($sql);
 		$data = array();
 		if ($description = Database::fetch_array($rs)) {
+            $data['description_type']	 = $description['description_type'];
 			$data['description_title']	 = $description['title'];
 			$data['description_content'] = $description['content'];
 			$data['progress'] 			 = $description['progress'];