diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 0262c60045..9fb867869f 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -170,7 +170,7 @@ js::set('hasTaskButton', $hasTaskButton);
' . html::a(helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branchID&executionID=$execution->id", '', true), $lang->bug->batchCreate, '', "class='iframe'") . '';?>
';?>
' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '';?>
- ' . html::a(helper::createLink('execution', 'importBug', "executionID=$executionID", '', true), $lang->execution->importBug, '', "class='ifram'") . '';?>
+ ' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='ifram'") . '';?>
' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '';?>
diff --git a/module/file/model.php b/module/file/model.php
index 399f895d1c..c666989beb 100644
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -62,7 +62,7 @@ class fileModel extends model
else
{
$file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
- $file->webPath = '/data/course/' . $file->pathname;
+ $file->webPath = 'data/course/' . $file->pathname;
}
}
@@ -81,9 +81,17 @@ class fileModel extends model
$file = $this->dao->findById($fileID)->from(TABLE_FILE)->fetch();
if(empty($file)) return false;
- $realPathName = $this->getRealPathName($file->pathname);
- $file->realPath = $this->savePath . $realPathName;
- $file->webPath = $this->webPath . $realPathName;
+ if($file->objectType != 'traincourse' and $file->objectType != 'traincontents')
+ {
+ $realPathName = $this->getRealPathName($file->pathname);
+ $file->realPath = $this->savePath . $realPathName;
+ $file->webPath = $this->webPath . $realPathName;
+ }
+ else
+ {
+ $file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
+ $file->webPath = 'data/course/' . $file->pathname;
+ }
return $file;
}