Commit f2b8d359 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Replace miscellaneous hardcoded view urls



Bug #1006634, part 3

Change-Id: I643746b18d01fa90c8d31571fd6fc3c30c97e04b
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent 532a72e8
......@@ -839,7 +839,7 @@ function delete_comment_submit(Pieform $form, $values) {
$url = 'view/artefact.php?view=' . $viewid . '&artefact=' . $artefact;
}
else {
$url = 'view/view.php?id=' . $viewid;
$url = $view->get_url(false);
}
db_begin();
......@@ -1074,7 +1074,7 @@ function add_feedback_form_submit(Pieform $form, $values) {
function add_feedback_form_cancel_submit(Pieform $form) {
global $view;
$form->reply(PIEFORM_OK, array(
'goto' => '/view/view.php?id=' . $view->get('id'),
'goto' => '/' . $view->get_url(false),
));
}
......
......@@ -87,7 +87,7 @@ if ($viewids = get_column('view', 'id', 'owner', $USER->get('id'), 'type', 'port
'type' => 'checkbox',
'title' => $view->get('title'),
'description' => $view->get('description'),
'viewlink' => get_config('wwwroot') . 'view/view.php?id=' . $viewid,
'viewlink' => $view->get_url(true, true),
);
}
$jsfiles = array('js/preview.js', 'js/export.js');
......
......@@ -5,7 +5,7 @@
{foreach from=$views item=view}
<tr class="{cycle values='r0,r1'}">
<td>
<h5><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h5>
<h5><a href="{$view.fullurl}">{$view.title}</a></h5>
{if $view.description}
<div>{$view.description|clean_html|safe}</div>
{/if}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment