Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions survey_builder/code/ui/frontend/SurveyPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -703,15 +703,14 @@ public function EditEntity($request)
{
// if we are not allowed to go to desired step , redirect to current step

$current_url = Controller::join_links
$current_url = Director::absoluteURL(Controller::join_links
(
Director::absoluteBaseURL(),
$this->Link(),
$step,
'edit',
$entity_survey_id,
$entity_step_template->title()
);
));

return $this->redirect($current_url);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,14 @@ protected function getPreviousStepUrl(ISurveyStep $previous_step)
throw new LogicException('step empty! - member_id %s', Member::currentUserID());

$entity_survey_id = intval($request->param('ENTITY_SURVEY_ID'));
$prev_step_url = Controller::join_links
$prev_step_url = Director::absoluteURL(Controller::join_links
(
Director::absoluteBaseURL(),
Controller::curr()->Link(),
$step,
'edit',
$entity_survey_id,
$previous_step->template()->title()
);
));
return $prev_step_url;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ public function setNextButtonTitle($next_btn_title){
* @return String
*/
protected function getPreviousStepUrl(ISurveyStep $previous_step){
$prev_step_url = Controller::join_links
$prev_step_url = Director::absoluteURL(Controller::join_links
(
Director::absoluteBaseURL(),
Controller::curr()->Link(),
$previous_step->template()->title()
);
));
return $prev_step_url;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,11 @@ public function build(ISurveyStep $step, $action, $form_name = 'SurveyStepForm')
* @return String
*/
protected function getPreviousStepUrl(ISurveyStep $previous_step){
$prev_step_url = Controller::join_links
$prev_step_url = Director::absoluteURL(Controller::join_links
(
Director::absoluteBaseURL(),
Controller::curr()->Link(),
$previous_step->template()->title()
);
));
return $prev_step_url;
}

Expand Down