Merge branch 'hotfix-487'

Author: xcompass

app/config/core.php

@@ -342,7 +342,7 @@
   $CWL['applicationID'] = '';
   $CWL['applicationPassword'] = '';
 
-  define('IPEER_VERSION', '3.0.3');
+  define('IPEER_VERSION', '3.0.4');
 
 
 /**

app/controllers/components/evaluation.php

@@ -285,10 +285,10 @@ function saveSimpleEvaluation($params=null, $groupEvent=null, $evaluationSubmiss
         }
 
         // if no submission exists, create one
-        $sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($grpEvent, $evaluator);
-        if (empty($sub)) {       
-            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
-            $evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
+        $sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEvent['GroupEvent']['id'], $evaluator);
+        if (empty($sub)) {
+            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEvent['GroupEvent']['id'];
+            $evaluationSubmission['EvaluationSubmission']['event_id'] = $groupEvent['GroupEvent']['event_id'];
             $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
             // save evaluation submission
             $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
@@ -1685,8 +1685,8 @@ function saveSurveyEvaluation($params=null)
             $evaluationSubmission['EvaluationSubmission']['submitted'] = 1;
             $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
             $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
-        } 
-        
+        }
+
         $surveyInput = array();
         $surveyInput['SurveyInput']['user_id'] = $userId;
         $surveyInput['SurveyInput']['event_id'] = $eventId;

readme.md

@@ -1,3 +1,8 @@
+iPeer 3.0.4
+---------------------------
+This is a maintenance release. It is recommended to upgrade to this version as it fixes a one critical bug.
+* Fix submissions for simple evaluation are not stored correctly
+
 iPeer 3.0.3
 ----------------------------
 This is a maintenance release. It is recommended to upgrade to this version as it fixes a one critical bug.

version.txt

@@ -1 +1 @@
-3.0.3
+3.0.4