dev: refactoring controller responses.php (admin/respones) ResponsesC…

…ontroller.php
LimeSurvey · Sep 28, 2021 · 58dbdd6 · 58dbdd6 · olleharstedt · Sep 28, 2021
1 parent 381fc5a
commit 58dbdd6
Show file tree

Hide file tree

Showing 59 changed files with 2,017 additions and 2,510 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,9 +12,9 @@
  */
 
 $config['versionnumber'] = '5.2.0-dev';
-$config['dbversionnumber'] = 475;
+$config['dbversionnumber'] = 476;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
-$config['assetsversionnumber'] = '30240';
+$config['assetsversionnumber'] = '30241';
 return $config;
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -366,7 +366,7 @@ public function getActionClasses()
         'questionthemes'   => 'questionthemes',
         'quotas'           => 'quotas',
         'remotecontrol'    => 'remotecontrol',
-        'responses'        => 'responses',
+//        'responses'        => 'responses',
         'saved'            => 'saved',
         'statistics'       => 'statistics',
       //  'survey'           => 'surveyadmin',

diff --git a/application/controllers/ResponsesController.php b/application/controllers/ResponsesController.php
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -406,7 +406,7 @@ public function import($surveyid)
                 }
                 Yii::app()->session['flashmessage'] = sprintf(gT("%s old response(s) and according timings were successfully imported."), $imported, $iRecordCountT);
             }
-            $this->getController()->redirect(array("/admin/responses/sa/index/", 'surveyid' => $surveyid));
+            $this->getController()->redirect(["/responses/index/", 'surveyId' => $surveyid]);
         }
     }
 
@@ -1494,7 +1494,7 @@ public function update()
             Yii::app()->setFlashMessage(sprintf(gT("The response record %s was updated."), $id));
         }
         if (Yii::app()->request->getPost('close-after-save') == 'true') {
-            $this->getController()->redirect($this->getController()->createUrl("admin/responses/sa/view/surveyid/{$surveyid}/id/{$id}"));
+            $this->getController()->redirect($this->getController()->createUrl("responses/view/", ['surveyId' => $surveyid, 'id' => $id]));
         } else {
             $this->getController()->redirect($this->getController()->createUrl("admin/dataentry/sa/editdata/subaction/edit/surveyid/{$surveyid}/id/{$id}"));
         }

diff --git a/application/controllers/admin/expressions.php b/application/controllers/admin/expressions.php
@@ -306,4 +306,4 @@ protected function _renderWrappedTemplate($sAction = 'expressions', $aViewUrls =
         header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
         parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData, $sRenderFile);
     }
-}
+}