Dev Fixed issue with deleting dependent records inside a transaction.

Dev Removed unused files.
LimeSurvey · Jun 30, 2015 · ac87009 · ac87009
1 parent 89aace1
commit ac87009
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 192 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -786,7 +786,9 @@ public function editdata($subaction, $id, $surveyid, $language='')
                                 }
 
                                 $oquery="SELECT other FROM {{questions}} WHERE qid={$fname['qid']} AND {{questions}}.language = '{$sDataEntryLanguage}'";
-                                $oresult=dbExecuteAssoc($oquery) or throw new \CHttpException(500, "Couldn't get other for list question<br />".$oquery."<br />");
+                                if (false === $oresult = dbExecuteAssoc($oquery)) {
+                                    throw new \CHttpException(500, "Couldn't get other for list question<br />".$oquery."<br />");
+                                }
                                 foreach($oresult->readAll() as $orow)
                                 {
                                     $fother=$orow['other'];
@@ -1454,7 +1456,9 @@ public function update()
             $updateqr = substr($updateqr, 0, -3);
             $updateqr .= " WHERE id=$id";
 
-            $updateres = dbExecuteAssoc($updateqr) or throw new \CHttpException(500, "Update failed:<br />\n<br />$updateqr");
+            if (false === $updateres = dbExecuteAssoc($updateqr)) {
+                throw new \CHttpException(500, "Update failed:<br />\n<br />$updateqr");
+            }
 
             $onerecord_link = $this->getController()->createUrl('/admin/responses/sa/view/surveyid/'.$surveyid.'/id/'.$id);
             $allrecords_link = $this->getController()->createUrl('/admin/responses/sa/index/surveyid/'.$surveyid);
@@ -2000,7 +2004,9 @@ public function view($surveyid, $lang=NULL)
                             $cdata['dearesult'] = $dearesult->readAll();
 
                             $oquery="SELECT other FROM {{questions}} WHERE qid={$deqrow['qid']} AND language='{$baselang}'";
-                            $oresult=dbExecuteAssoc($oquery) or throw new \CHttpException(500, "Couldn't get other for list question<br />".$oquery);
+                            if (false === $oresult = dbExecuteAssoc($oquery)) {
+                                throw new \CHttpException(500, "Couldn't get other for list question<br />" . $oquery);
+                            }
                             foreach($oresult->readAll() as $orow)
                             {
                                 $cdata['fother']=$orow['other'];
@@ -2070,7 +2076,9 @@ public function view($surveyid, $lang=NULL)
                             }
 
                             $oquery="SELECT other FROM {{questions}} WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}'";
-                            $oresult=dbExecuteAssoc($oquery) or throw new \CHttpException(500, "Couldn't get other for list question<br />");
+                            if (false === $oresult=dbExecuteAssoc($oquery)) {
+                                throw new \CHttpException(500, "Couldn't get other for list question<br />");
+                            }
                             foreach($oresult->readAll() as $orow)
                             {
                                 $fother=$orow['other'];

diff --git a/application/errors/error_404.php b/application/errors/error_404.php
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
diff --git a/application/errors/index.html b/application/errors/index.html
diff --git a/application/extensions/AdminFooter/AdminFooter.php b/application/extensions/AdminFooter/AdminFooter.php
diff --git a/application/extensions/AdminFooter/views/footer.php b/application/extensions/AdminFooter/views/footer.php
diff --git a/application/extensions/GridViewWidget.php b/application/extensions/GridViewWidget.php
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -893,7 +893,7 @@ public function dependentRelations() {
          * @throws CDbException
          */
         public function deleteDependent() {
-            if (App()->db->getCurrentTransaction() != null) {
+            if (App()->db->getCurrentTransaction() == null) {
                 $transaction = App()->db->beginTransaction();
             }
             foreach($this->dependentRelations() as $relation) {

diff --git a/application/models/QuestionGroup.php b/application/models/QuestionGroup.php
@@ -156,7 +156,7 @@ public function dependentRelations() {
          * @throws CDbException
          */
         public function deleteDependent() {
-            if (App()->db->getCurrentTransaction() != null) {
+            if (App()->db->getCurrentTransaction() == null) {
                 $transaction = App()->db->beginTransaction();
             }
             foreach($this->dependentRelations() as $relation) {

diff --git a/application/models/Quota.php b/application/models/Quota.php
@@ -101,7 +101,7 @@ public function dependentRelations() {
      * @throws CDbException
      */
     public function deleteDependent() {
-        if (App()->db->getCurrentTransaction() != null) {
+        if (App()->db->getCurrentTransaction() == null) {
             $transaction = App()->db->beginTransaction();
         }
         foreach($this->dependentRelations() as $relation) {

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -50,7 +50,8 @@ public function attributeLabels() {
             'completedResponseCount' => gT("Completed"),
             'partialResponseCount' => gT("Partial"),
             'responseCount' => gT("Total"),
-            'responseRate' => gT('Rate')
+            'responseRate' => gT('Rate'),
+            'sid' => gT('Survey ID')
 
 
         ];

diff --git a/application/models/import/Group.php b/application/models/import/Group.php
@@ -0,0 +1,13 @@
+<?php
+namespace ls\models\import;
+
+/**
+ * Import class for QuestionGroup model
+ */
+class Group extends \QuestionGroup
+{
+    public function rules() {
+
+    }
+
+}