Fix missing field c_student_publication.document_id

main/work/upload_from_template.php

@@ -57,7 +57,13 @@ $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'work/work.php?'
 $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'work/work_list.php?'.api_get_cidreq().'&id='.$work_id, 'name' =>  $workInfo['title']);
 $interbreadcrumb[] = array('url' => '#', 'name'  => get_lang('UploadFromTemplate'));
 
-$form = new FormValidator('form', 'POST', api_get_self()."?".api_get_cidreq()."&id=".$work_id, '', array('enctype' => "multipart/form-data"));
+$form = new FormValidator(
+    'form',
+    'POST',
+    api_get_self()."?".api_get_cidreq()."&id=".$work_id,
+    '',
+    array('enctype' => "multipart/form-data")
+);
 setWorkUploadForm($form, $workInfo['allow_text_assignment']);
 $form->addElement('hidden', 'document_id', $documentId);
 $form->addElement('hidden', 'id', $work_id);
@@ -65,6 +71,7 @@ $form->addElement('hidden', 'sec_token', $token);
 
 $documentTemplateData = getDocumentTemplateFromWork($work_id, $course_info, $documentId);
 
+$defaults = [];
 if (!empty($documentTemplateData)) {
     $defaults['title'] = $userInfo['complete_name'].'_'.$documentTemplateData['title'].'_'.substr(api_get_utc_datetime(), 0, 10);
     $defaults['description'] = $documentTemplateData['file_content'];
@@ -79,7 +86,14 @@ if ($form->validate()) {
     if ($student_can_edit_in_session && $check) {
         $values = $form->getSubmitValues();
         // Process work
-        $error_message = processWorkForm($workInfo, $values, $course_info, $id_session, $group_id, $user_id);
+        $error_message = processWorkForm(
+            $workInfo,
+            $values,
+            $course_info,
+            $id_session,
+            $group_id,
+            $user_id
+        );
         $script = 'work_list.php';
         if ($is_allowed_to_edit) {
             $script = 'work_list_all.php';

main/work/work.lib.php

@@ -1652,7 +1652,8 @@ function get_work_user_list_from_documents(
 
     $sql = "(
                 $select1 FROM $userTable u
-                INNER JOIN $workTable w ON (u.user_id = w.user_id AND w.active IN (0, 1) AND w.filetype = 'file')
+                INNER JOIN $workTable w
+                ON (u.user_id = w.user_id AND w.active IN (0, 1) AND w.filetype = 'file')
                 WHERE
                     w.c_id = $courseId
                     $userCondition
@@ -1661,8 +1662,10 @@ function get_work_user_list_from_documents(
                     $workParentCondition
             ) UNION (
                 $select2 FROM $workTable w
-                INNER JOIN $workRelDocument w_rel ON (w_rel.work_id = w.id AND w.active IN (0, 1) AND w_rel.c_id = w.c_id)
-                INNER JOIN $documentTable d ON (w_rel.document_id = d.id AND d.c_id = w.c_id)
+                INNER JOIN $workRelDocument w_rel
+                ON (w_rel.work_id = w.id AND w.active IN (0, 1) AND w_rel.c_id = w.c_id)
+                INNER JOIN $documentTable d
+                ON (w_rel.document_id = d.id AND d.c_id = w.c_id)
                 INNER JOIN $userTable u ON (u.user_id = $studentId)
                 WHERE
                     w.c_id = $courseId

src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150713132630.php

@@ -8,6 +8,7 @@ use Doctrine\DBAL\Schema\Schema;
 
 /**
  * Class Version20150713132630
+ *
  * @package Chamilo\CoreBundle\Migrations\Schema\V110
  */
 class Version20150713132630 extends AbstractMigrationChamilo
@@ -19,6 +20,7 @@ class Version20150713132630 extends AbstractMigrationChamilo
     {
         $this->addSql('ALTER TABLE c_student_publication ADD url_correction VARCHAR(255) DEFAULT NULL');
         $this->addSql('ALTER TABLE c_student_publication ADD title_correction VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE c_student_publication ADD document_id INT NOT NULL');
     }
 
     /**
@@ -28,5 +30,6 @@ class Version20150713132630 extends AbstractMigrationChamilo
     {
         $this->addSql('ALTER TABLE c_student_publication DROP url_correction');
         $this->addSql('ALTER TABLE c_student_publication DROP title_correction');
+        $this->addSql('ALTER TABLE c_student_publication DROP document_id');
     }
 }

src/Chamilo/CourseBundle/Entity/CStudentPublication.php

@@ -190,6 +190,14 @@ class CStudentPublication
      */
     private $containsFile;
 
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="document_id", type="integer", nullable=false)
+     */
+    private $documentId;
+
     /**
      * Set url
      *
@@ -727,4 +735,20 @@ class CStudentPublication
     {
         $this->titleCorrection = $titleCorrection;
     }
+
+    /**
+     * @return int
+     */
+    public function getDocumentId()
+    {
+        return $this->documentId;
+    }
+
+    /**
+     * @param int $documentId
+     */
+    public function setDocumentId($documentId)
+    {
+        $this->documentId = $documentId;
+    }
 }