Merge remote-tracking branch 'origin/qa' into qa

models/Form.php

@@ -667,8 +667,6 @@ class Form {
                   
                   //use the cache 
                   Yii::app()->session["forms"] = $allforms;
-                  
-
             } else {
                 if(isset($_GET["form"]))
                     $params["formId"] = $_GET["form"];
@@ -678,7 +676,7 @@ class Form {
             
             
             // $answer = ( isset(Yii::app()->session["costum"]["form"]["canModifyAnswer"]) && isset($_GET['answer'])) ? PHDB::findOne( Form::ANSWER_COLLECTION,[ "_id" => new MongoId($_GET['answer']) ] ) : null;
-            $answer = ( isset($_GET['answer'])) ? PHDB::findOne( Form::ANSWER_COLLECTION,[ "_id" => new MongoId($_GET['answer']) ] ) : null;
+            $answer = ( isset($_GET['answer']) && $_GET['answer'] != "new") ? PHDB::findOne( Form::ANSWER_COLLECTION,[ "_id" => new MongoId($_GET['answer']) ] ) : null;
             $showForm = true;
             $generateAnswer = false;
             $myAnswers = PHDB::find( Form::ANSWER_COLLECTION,[ 
@@ -708,7 +706,7 @@ class Form {
                 }
               }
               
-              if( $answer == null && count( $myAnswers ) > 1 && !$canEdit )
+              if( $answer == null && count( $myAnswers ) > 1 && !$params["canEdit"] )
                 $showForm = false;
 
               //si aucune reponse existe