* fix bug #22570
This commit is contained in:
@@ -649,10 +649,11 @@ class caselibModel extends model
|
||||
}
|
||||
$menu .= $this->buildMenu('testcase', 'edit', $params, $case, 'browse');
|
||||
$deleteIconEnabled = $this->buildMenu('testcase', 'delete', $params, $case, 'browse', '', '', '', '', '', '', false);
|
||||
if(common::hasPriv('testcase', 'delete') && $deleteIconEnabled)
|
||||
if(common::hasPriv('testcase', 'delete'))
|
||||
{
|
||||
$deleteURL = helper::createLink('testcase', 'delete', "$params&confirm=yes");
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$this->lang->testcase->delete}' class='btn'");
|
||||
$class = $deleteIconEnabled ? 'btn disabled' : 'btn';
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$this->lang->testcase->delete}' class='{$class}'");
|
||||
}
|
||||
|
||||
return $menu;
|
||||
|
||||
@@ -739,10 +739,11 @@ class releaseModel extends model
|
||||
$menu .= $this->buildMenu('release', 'notify', "release=$release->id", $release, 'browse', 'bullhorn', '', 'iframe', true);
|
||||
$deleteIconEnabled = $this->buildMenu('release', 'delete', "release=$release->id", $release, 'browse', '', '', '', '', '', '', false);
|
||||
|
||||
if(common::hasPriv('release', 'delete', $release) && $deleteIconEnabled)
|
||||
if(common::hasPriv('release', 'delete', $release))
|
||||
{
|
||||
$deleteURL = helper::createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"releaseList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$this->lang->release->delete}'");
|
||||
$class = $deleteIconEnabled ? 'btn disabled' : 'btn';
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"releaseList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='{$class}' title='{$this->lang->release->delete}'");
|
||||
}
|
||||
|
||||
return $menu;
|
||||
|
||||
@@ -2232,10 +2232,11 @@ class testtaskModel extends model
|
||||
$menu .= $this->buildMenu('testtask', 'view', $params, $task, 'browse', 'list-alt', '', 'iframe', true, "data-width='90%'");
|
||||
$menu .= $this->buildMenu('testtask', 'edit', $params, $task, 'browse');
|
||||
$deleteIconEnabled = $this->buildMenu('testtask', 'delete', $params, $task, 'browse', '', '', '', '', '', '', false);
|
||||
if(common::hasPriv('testtask', 'delete', $task) && $deleteIconEnabled)
|
||||
if(common::hasPriv('testtask', 'delete', $task))
|
||||
{
|
||||
$deleteURL = helper::createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$this->lang->testtask->delete}' class='btn'");
|
||||
$class = $deleteIconEnabled ? 'btn disabled' : 'btn';
|
||||
$menu .= html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$this->lang->testtask->delete}' class='{$class}'");
|
||||
}
|
||||
return $menu;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user