Skip to content

Commit

Permalink
Dev: Fix links to old survey controller
Browse files Browse the repository at this point in the history
  • Loading branch information
olleharstedt committed Mar 5, 2021
1 parent 5312a06 commit 4d16745
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/checkintegrity.php
Expand Up @@ -1015,7 +1015,7 @@ protected function checkGroupOrderDuplicates()
if (!empty($result)) {
foreach ($result as &$survey) {
$survey['organizerLink'] = Yii::app()->getController()->createUrl(
'admin/survey/sa/organize',
'surveyAdministration/organize',
[
'surveyid' => $survey['sid'],
]
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/statistics.php
Expand Up @@ -120,7 +120,7 @@ public function run($surveyid = 0, $subaction = null)

if (!$oSurvey->isActive) {
Yii::app()->setFlashMessage(gT("This survey is not active and has no responses."), 'error');
$this->getController()->redirect($this->getController()->createUrl("/admin/survey/sa/view/surveyid/{$surveyid}"));
$this->getController()->redirect($this->getController()->createUrl("/surveyAdministration/view/surveyid/{$surveyid}"));
}

// Set language for questions and answers to base language of this survey
Expand Down Expand Up @@ -680,7 +680,7 @@ public function simpleStatistics($surveyid)

if (!$oSurvey->isActive) {
Yii::app()->setFlashMessage(gT("This survey is not active and has no responses."), 'error');
$this->getController()->redirect($this->getController()->createUrl("/admin/survey/sa/view/surveyid/{$oSurveyid}"));
$this->getController()->redirect($this->getController()->createUrl("/surveyAdministration/view/surveyid/{$oSurveyid}"));
}


Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/themes.php
Expand Up @@ -170,7 +170,7 @@ public function upload()
{
$action = returnGlobal('action');
if ($action == 'templateuploadimagefile' && App()->request->getPost('surveyid')) {
App()->getController()->forward("/admin/survey/sa/uploadimagefile/");
App()->getController()->forward("/surveyAdministration/uploadimagefile/");
App()->end();
}
$sTemplateName = App()->request->getPost('templatename');
Expand Down
Expand Up @@ -6,7 +6,7 @@
- $model : the survey search model
- $bRenderFooter : set if the footer should the footer be rendered
- $bRenderSearchBox : set if the search boxes should be rendered
- $formUrl : url of the action for the search action (default: admin/survey/sa/listsurveys/)
- $formUrl : url of the action for the search action (default: surveyAdministration/listsurveys/)

## Usage Example:

Expand Down
2 changes: 1 addition & 1 deletion application/helpers/admin/activate_helper.php
Expand Up @@ -275,7 +275,7 @@ function checkQuestions($postsid, $iSurveyID)
$fieldmap = createFieldMap($survey, 'full', true, false, $survey->language, $aDuplicateQIDs);
if (count($aDuplicateQIDs)) {
foreach ($aDuplicateQIDs as $iQID => $aDuplicate) {
$sFixLink = "[<a class='selector__fixConsistencyProblem' href='" . Yii::app()->getController()->createUrl("/admin/survey/sa/activate/surveyid/{$iSurveyID}/fixnumbering/{$iQID}") . "'>Click here to fix</a>]";
$sFixLink = "[<a class='selector__fixConsistencyProblem' href='" . Yii::app()->getController()->createUrl("/surveyAdministration/activate/surveyid/{$iSurveyID}/fixnumbering/{$iQID}") . "'>Click here to fix</a>]";
$failedcheck[] = array($iQID, $aDuplicate['question'], ": Bad duplicate fieldname {$sFixLink}", $aDuplicate['gid']);
}
}
Expand Down
Expand Up @@ -215,19 +215,19 @@

<!-- Edit text elements and general settings -->
<?php if($surveylocale && $surveysettings): ?>
<div class="panel panel-primary panel-clickable" id="panel-3" data-url="<?php echo $this->createUrl("admin/survey/sa/editlocalsettings/surveyid/".$oSurvey->sid); ?>">
<div class="panel panel-primary panel-clickable" id="panel-3" data-url="<?php echo $this->createUrl("surveyAdministration/editlocalsettings/surveyid/".$oSurvey->sid); ?>">
<div class="panel-heading">
<div class="panel-title h4"><?php eT('Edit text elements and general settings');?></div>
</div>
<div class="panel-body">
<div class="panel-body-ico">
<a href="<?php echo $this->createUrl("admin/survey/sa/editlocalsettings/surveyid/".$oSurvey->sid); ?>" >
<a href="<?php echo $this->createUrl("surveyAdministration/editlocalsettings/surveyid/".$oSurvey->sid); ?>" >
<span class="icon-edit text-success" style="font-size: 3em;"></span>
<span class="sr-only"><?php eT('Edit text elements and general settings');?></span>
</a>
</div>
<div class="panel-body-link">
<p><a href="<?php echo $this->createUrl("admin/survey/sa/editlocalsettings/surveyid/".$oSurvey->sid); ?>"><?php eT('Edit text elements and general settings');?></a></p>
<p><a href="<?php echo $this->createUrl("surveyAdministration/editlocalsettings/surveyid/".$oSurvey->sid); ?>"><?php eT('Edit text elements and general settings');?></a></p>
</div>
</div>
</div>
Expand Down
Expand Up @@ -35,7 +35,7 @@ class="selectTemplate btn btn-default btn-success disabled"
<button
data-selectedtext="<?php eT("Selected!");?>"
data-unselectedtext="<?php eT('Select');?> &nbsp; <?php echo $key;?>"
data-url="<?php echo Yii::app()->urlManager->createUrl("admin/survey/sa/changetemplate/surveyid/$iSurveyId/template/$key" ); ?>"
data-url="<?php echo Yii::app()->urlManager->createUrl("surveyAdministration/changetemplate/surveyid/$iSurveyId/template/$key" ); ?>"
data-template="<?php echo $key;?>"
class="selectTemplate btn btn-default">
<?php eT('Select');?>&nbsp;<?php echo $key;?>
Expand Down
Expand Up @@ -17,7 +17,7 @@
<?php eT("Import resources ZIP archive"); ?>
</h4>
</div>
<?php echo CHtml::form(array('admin/survey/sa/importsurveyresources'), 'post', array('id'=>'importsurveyresources', 'name'=>'importsurveyresources', 'class'=>'form30', 'enctype'=>'multipart/form-data', 'onsubmit'=>'return window.LS.validatefilename(this,"'. gT('Please select a file to import!', 'js').'");')); ?>
<?php echo CHtml::form(array('surveyAdministration/importsurveyresources'), 'post', array('id'=>'importsurveyresources', 'name'=>'importsurveyresources', 'class'=>'form30', 'enctype'=>'multipart/form-data', 'onsubmit'=>'return window.LS.validatefilename(this,"'. gT('Please select a file to import!', 'js').'");')); ?>
<div class="modal-body">
<input type='hidden' name='surveyid' value='<?php echo $surveyid; ?>' />
<input type='hidden' name='action' value='importsurveyresources' />
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/survey/surveybar_activation.php
Expand Up @@ -18,7 +18,7 @@

<!-- activate -->
<?php if ($canactivate): ?>
<a id='ls-activate-survey' class="btn btn-success" href="<?php echo $this->createUrl("admin/survey/sa/activate/surveyid/$oSurvey->sid"); ?>" role="button">
<a id='ls-activate-survey' class="btn btn-success" href="<?php echo $this->createUrl("surveyAdministration/activate/surveyid/$oSurvey->sid"); ?>" role="button">
<?php eT("Activate this survey"); ?>
</a>

Expand Down Expand Up @@ -51,7 +51,7 @@

<!-- Stop survey -->
<?php if ($canactivate): ?>
<a class="btn btn-danger btntooltip" href="<?php echo $this->createUrl("admin/survey/sa/deactivate/surveyid/$oSurvey->sid"); ?>" role="button">
<a class="btn btn-danger btntooltip" href="<?php echo $this->createUrl("surveyAdministration/deactivate/surveyid/$oSurvey->sid"); ?>" role="button">
<i class="fa fa-stop-circle" ></i>
<?php eT("Stop this survey"); ?>
</a>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/survey/surveybar_tools.php
Expand Up @@ -28,7 +28,7 @@

<!-- Delete survey -->
<li>
<a href="<?php echo $this->createUrl("admin/survey/sa/delete/surveyid/{$oSurvey->sid}"); ?>">
<a href="<?php echo $this->createUrl("surveyAdministration/delete/surveyid/{$oSurvey->sid}"); ?>">
<span class="fa fa-trash" ></span>
<?php eT("Delete survey"); ?>
</a>
Expand Down

0 comments on commit 4d16745

Please sign in to comment.