Fix work edition see #7642

main/work/edit_work.php

@@ -96,7 +96,7 @@ $form->addElement('hidden', 'work_id', $workId);
 $form->addButtonUpdate(get_lang('ModifyDirectory'));
 
 if ($form->validate()) {
-    $params = $form->exportValues();
+    $params = $form->getSubmitValues();
     $workId = $params['work_id'];
     $editCheck = false;
     $workData = get_work_data_by_id($workId);

main/work/work.lib.php

@@ -658,8 +658,13 @@ function display_student_publications_list(
             // form edit directory
             $homework = array();
             if (!empty($row['has_properties'])) {
-                $sql = Database::query('SELECT * FROM '.$work_assigment.'
-                WHERE c_id = '.$course_id.' AND id = "'.$row['has_properties'].'" LIMIT 1');
+                $sql = 'SELECT *
+                        FROM '.$work_assigment.'
+                        WHERE
+                            c_id = '.$course_id.' AND
+                            id = "'.$row['has_properties'].'"
+                        LIMIT 1';
+                $sql = Database::query($sql);
                 $homework = Database::fetch_array($sql);
             }
             // save original value for later
@@ -1513,10 +1518,9 @@ function to_javascript_work()
                 $("#work_title").focus();
             }
 
-            $(document).ready(function () {
+            $(document).ready(function() {
                 setFocus();
 
-                $("#expiry_date").click(function() {
                 var checked = $("#expiry_date").attr("checked");
                 if (checked) {
                     $("#option2").show();
@@ -1527,6 +1531,9 @@ function to_javascript_work()
                     $("#option3").hide();
                     $("#end_date").attr("checked", false);
                 }
+
+                $("#expiry_date").click(function() {
+                    $("#option2").toggle();
                 });
 
                 $("#end_date").click(function() {
@@ -3570,6 +3577,11 @@ function addWorkComment($courseInfo, $userId, $parentWork, $work, $data)
 
     $commentId = Database::insert($commentTable, $params);
 
+    if ($commentId) {
+        $sql = "UPDATE $commentTable SET id = iid WHERE iid = $commentId";
+        Database::query($sql);
+    }
+
     $userIdListToSend = array();
 
     if (api_is_allowed_to_edit()) {
@@ -4033,7 +4045,7 @@ function processWorkForm($workInfo, $values, $courseInfo, $sessionId, $groupId,
  */
 function addDir($params, $user_id, $courseInfo, $group_id, $session_id)
 {
-    $work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+    $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
 
     $user_id = intval($user_id);
     $group_id = intval($group_id);
@@ -4093,6 +4105,7 @@ function addDir($params, $user_id, $courseInfo, $group_id, $session_id)
             if (api_get_course_setting('email_alert_students_on_new_homework') == 1) {
                 send_email_on_homework_creation(api_get_course_id());
             }
+
             return $id;
         }
     }
@@ -4217,7 +4230,6 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId)
 
     $data = get_work_assignment_by_id($workId, $course_id);
 
-    if (empty($data)) {
     if (!empty($expiryDate)) {
         $expiryDateCondition = "expires_on = '".Database::escape_string($expiryDate)."', ";
     } else {
@@ -4230,6 +4242,8 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId)
         $endOnCondition = "ends_on = null, ";
     }
 
+    if (empty($data)) {
+
         $sql = "INSERT INTO $table SET
                 c_id = $course_id ,
                 $expiryDateCondition
@@ -4243,7 +4257,7 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId)
         $my_last_id = Database::insert_id();
         if ($my_last_id) {
 
-            $sql = "UPDATE $workTable SET
+            $sql = "UPDATE $table SET
                         id = iid
                     WHERE iid = $my_last_id";
             Database::query($sql);
@@ -4256,8 +4270,8 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $groupId)
         }
     } else {
         $sql = "UPDATE $table SET
-                    expires_on = '".$expiryDate."',
-                    ends_on = '".$endDate."',
+                    $expiryDateCondition
+                    $endOnCondition
                     add_to_calendar  = $agendaId,
                     enable_qualification = '".$qualification."'
                 WHERE