Changeset 879b69e in iPeer


Ignore:
Timestamp:
2013-02-22T12:19:34-08:00 (6 years ago)
Author:
Compass <pan.luo@…>
Branches:
3.1.x, dev, hotfix, master, pagodabox
Children:
6db70cb, a716840, c99978c
Parents:
78c2e86 (diff), e3e62bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'hotfix-487'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • app/config/core.php

    r78c2e86 r879b69e  
    343343  $CWL['applicationPassword'] = '';
    344344
    345   define('IPEER_VERSION', '3.0.3');
     345  define('IPEER_VERSION', '3.0.4');
    346346
    347347
  • app/controllers/components/evaluation.php

    r78c2e86 r879b69e  
    286286
    287287        // if no submission exists, create one
    288         $sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($grpEvent, $evaluator);
    289         if (empty($sub)) {       
    290             $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $grpEvent;
    291             $evaluationSubmission['EvaluationSubmission']['event_id'] = $event;
     288        $sub = $this->EvaluationSubmission->getEvalSubmissionByGrpEventIdSubmitter($groupEvent['GroupEvent']['id'], $evaluator);
     289        if (empty($sub)) {
     290            $evaluationSubmission['EvaluationSubmission']['grp_event_id'] = $groupEvent['GroupEvent']['id'];
     291            $evaluationSubmission['EvaluationSubmission']['event_id'] = $groupEvent['GroupEvent']['event_id'];
    292292            $evaluationSubmission['EvaluationSubmission']['submitter_id'] = $evaluator;
    293293            // save evaluation submission
     
    16861686            $evaluationSubmission['EvaluationSubmission']['date_submitted'] = date('Y-m-d H:i:s');
    16871687            $evaluationSubmission['EvaluationSubmission']['event_id'] = $eventId;
    1688         } 
    1689        
     1688        }
     1689
    16901690        $surveyInput = array();
    16911691        $surveyInput['SurveyInput']['user_id'] = $userId;
  • readme.md

    r78c2e86 r879b69e  
     1iPeer 3.0.4
     2---------------------------
     3This is a maintenance release. It is recommended to upgrade to this version as it fixes a one critical bug.
     4* Fix submissions for simple evaluation are not stored correctly
     5
    16iPeer 3.0.3
    27----------------------------
  • version.txt

    r78c2e86 r879b69e  
    1 3.0.3
     13.0.4
Note: See TracChangeset for help on using the changeset viewer.