diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index df9a7c29e5..dace5855e5 100644
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -55,6 +55,7 @@ function toggleShow(obj)
}
$('.changes').each(function(){
var box = $(this).parent();
+ while($(box).attr('tagName').toLowerCase() != 'li') box = $(box).parent();
var switchButtonID = ($(box).find('span').find("input[type='button']").attr('id'));
switchChange(switchButtonID.replace('switchButton', ''));
})
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 4dac475d69..0b862abb8e 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -24,25 +24,26 @@ table .table-1 td{border:0px;}
| id . html::hidden("version[$case->id]", $case->version)?> |
testcase->priList[$case->pri]?> |
- module]?> |
- title?> |
- id]", $resultList, 'pass', "onchange='showAction(this.value,\".action$caseID\")'")?> |
+ module] . "'>" . $moduleOptionMenu[$case->module] . ""?> |
+ title'>$case->title"?> |
+ id]", $resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'")?> |
-
+
$step):?>
- | desc'>" . $i . "、" . $step->desc . ''?> |
- expect'>" . $lang->testcase->stepExpect . ":" . $step->expect . ''?> |
- testcase->resultList, 'pass') . html::input("reals[$caseID][$stepID]", '', "class='text-2'");?> |
+ desc'>" . $i . "、" . $step->desc . ''?> |
+ expect'>" . $lang->testcase->stepExpect . ":" . $step->expect . ''?> |
+ testcase->resultList, 'pass')?> |
+ |
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 1c1c190b23..73c998f3c5 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -56,14 +56,14 @@
{
echo html::select('allProject', $allProject, '', 'onchange=syncProductOrProject(this,"project")');
echo html::select('projectModule', $projectModules, '');
- echo html::commonButton($lang->tree->syncFromProject, 'id=copyModule onclick=syncModule('.$currentProject.',"task")');
+ echo html::commonButton($lang->tree->syncFromProject, "id='copyModule' onclick='syncModule($currentProject, \"task\")'");
}
echo ' ';
}
elseif($viewType != 'story' and strpos($viewType, 'doc') === false and $viewType != 'webapp')
{
echo html::select('productModule', $productModules, '', 'class=select-3');
- echo html::commonButton($lang->tree->syncFromProduct, 'onclick=syncModule('.$rootID.')');
+ echo html::commonButton($lang->tree->syncFromProduct, 'onclick="syncModule('.$rootID.')"');
echo ' ';
}
else if($viewType == 'story')
@@ -72,7 +72,7 @@
{
echo html::select('allProduct', $allProduct, '', 'onchange=syncProductOrProject(this,"product")');
echo html::select('productModule', $productModules, '');
- echo html::commonButton($lang->tree->syncFromProduct, 'id=copyModule onclick=syncModule('.$currentProduct.')');
+ echo html::commonButton($lang->tree->syncFromProduct, "id='copyModule' onclick='syncModule($currentProduct, \"story\")'");
}
echo ' ';
}
diff --git a/module/webapp/control.php b/module/webapp/control.php
index f7a85e44c9..aa2b518b92 100644
--- a/module/webapp/control.php
+++ b/module/webapp/control.php
@@ -87,7 +87,11 @@ class webapp extends control
{
$this->webapp->update($webappID);
if(dao::isError())die(js::error(dao::getError()));
- die(js::reload('parent'));
+ echo "";
+ die();
}
$this->view->modules = $this->webapp->getModules();
diff --git a/module/webapp/model.php b/module/webapp/model.php
index 84acb1dbd2..a4fe064b0f 100644
--- a/module/webapp/model.php
+++ b/module/webapp/model.php
@@ -215,7 +215,7 @@ class webappModel extends model
$installWebapp->author = $webapp->author;
$installWebapp->url = $webapp->url;
$installWebapp->icon = $webapp->icon ? $this->config->webapp->url . $webapp->icon : '';
- $installWebapp->target = $webapp->target;
+ $installWebapp->target = empty($webapp->target) ? 'blank' : $webapp->target;
$installWebapp->size = $webapp->size;
$installWebapp->desc = $webapp->desc;
$installWebapp->addedBy = $this->app->user->account;
|