From 6dbe327790ba00de3fee89485acde8317ffbad51 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Thu, 26 Sep 2013 06:23:59 +0000 Subject: [PATCH] * fix bug 504. --- module/company/view/browse.html.php | 2 +- module/doc/view/browse.html.php | 7 +++++-- module/my/view/testcase.html.php | 7 +++++-- module/my/view/testtask.html.php | 7 +++++-- module/my/view/todo.html.php | 7 +++++-- module/product/view/doc.html.php | 7 +++++-- module/productplan/view/browse.html.php | 7 +++++-- module/productplan/view/linkbug.html.php | 7 +++++-- module/productplan/view/linkstory.html.php | 7 +++++-- module/productplan/view/view.html.php | 14 ++++++++++---- module/project/view/build.html.php | 7 +++++-- module/project/view/doc.html.php | 7 +++++-- module/project/view/story.html.php | 7 +++++-- module/project/view/team.html.php | 7 +++++-- module/project/view/testtask.html.php | 7 +++++-- module/release/view/browse.html.php | 7 +++++-- module/testcase/view/browse.html.php | 7 +++++-- module/testtask/view/browse.html.php | 7 +++++-- module/testtask/view/cases.html.php | 7 +++++-- 19 files changed, 96 insertions(+), 39 deletions(-) diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 849a6ef4f1..f8573d94f9 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -74,7 +74,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); id&from=company", '', 'list'); - if(strpos($this->app->company->admins, ",{$user->account},") === false) + if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->user->delete}'"); diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 7650b6fe8c..4dacde031e 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -70,8 +70,11 @@ var browseType = ''; id}", '', 'list'); - $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + if(common::hasPriv('doc', 'delete')) + { + $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + } ?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 1ebf31db8c..d1878fa407 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -70,8 +70,11 @@ common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); - $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + if(common::hasPriv('testcase', 'delete')) + { + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + } common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug'); ?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 3f081983c8..ce7925922b 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -53,8 +53,11 @@ common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + if(common::hasPriv('testtask', 'delete')) + { + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + } ?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 5defe2b0d3..eb0add02f5 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -84,8 +84,11 @@ common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', '', 'hiddenwin'); common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', '', '', 'iframe', true); - $deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->todo->delete}'"); + if(common::hasPriv('todo', 'delete')) + { + $deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->todo->delete}'"); + } ?> diff --git a/module/product/view/doc.html.php b/module/product/view/doc.html.php index bad2f281b7..866cd53168 100644 --- a/module/product/view/doc.html.php +++ b/module/product/view/doc.html.php @@ -42,8 +42,11 @@ id}"); - $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + if(common::hasPriv('doc', 'delete')) + { + $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + } ?> diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 2e577f4f12..a43de2711b 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -42,8 +42,11 @@ common::printIcon('productplan', 'linkBug', "planID=$plan->id", '', 'list'); common::printIcon('productplan', 'edit', "planID=$plan->id", '', 'list'); - $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplan\",confirmDelete)", '', '', "class='link-icon' title='{$lang->productplan->delete}'"); + if(common::hasPriv('productplan', 'delete')) + { + $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplan\",confirmDelete)", '', '', "class='link-icon' title='{$lang->productplan->delete}'"); + } ?> diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index a31bcc39e1..444c9d7be2 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -90,8 +90,11 @@ bug->statusList[$bug->status];?> createLink('productplan', 'unlinkBug', "bugID=$bug->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", ' ', '', "class='icon-green-productplan-unlinkBug' title='{$lang->productplan->unlinkBug}'"); + if(common::hasPriv('productplan', 'unlinkBug')) + { + $unlinkURL = $this->createLink('productplan', 'unlinkBug', "bugID=$bug->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", ' ', '', "class='icon-green-productplan-unlinkBug' title='{$lang->productplan->unlinkBug}'"); + } ?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 4b68bee81a..798a901b77 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -98,8 +98,11 @@ story->stageList[$story->stage];?> createLink('productplan', 'unlinkStory', "storyID=$story->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->productplan->unlinkStory}'"); + if(common::hasPriv('productplan', 'unlinkStory')) + { + $unlinkURL = $this->createLink('productplan', 'unlinkStory', "storyID=$story->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->productplan->unlinkStory}'"); + } ?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 3e3f3ca01b..473214d559 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -101,8 +101,11 @@ story->stageList[$story->stage];?> createLink('productplan', 'unlinkStory', "story=$story->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->productplan->unlinkStory}'"); + if(common::hasPriv('productplan', 'unlinkStory')) + { + $unlinkURL = $this->createLink('productplan', 'unlinkStory', "story=$story->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->productplan->unlinkStory}'"); + } ?> @@ -157,8 +160,11 @@ bug->statusList[$bug->status];?> createLink('productplan', 'unlinkBug', "story=$bug->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", ' ', '', "class='icon-green-productplan-unlinkBug' title='{$lang->productplan->unlinkBug}'"); + if(common::hasPriv('productplan', 'unlinkBug')) + { + $unlinkURL = $this->createLink('productplan', 'unlinkBug', "story=$bug->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"bugList\",confirmUnlinkBug)", ' ', '', "class='icon-green-productplan-unlinkBug' title='{$lang->productplan->unlinkBug}'"); + } ?> diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index ccc33f3225..ce6b8c0193 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -46,8 +46,11 @@ $lang->project->bug = $lang->project->viewBug; common::printIcon('project', 'bug', "project=$project->id&orderBy=status&build=$build->id", '', 'list'); common::printIcon('build', 'edit', "buildID=$build->id"); - $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->build->delete}'"); + if(common::hasPriv('build', 'delete')) + { + $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->build->delete}'"); + } ?> diff --git a/module/project/view/doc.html.php b/module/project/view/doc.html.php index 90579542d6..cfc3ff4093 100644 --- a/module/project/view/doc.html.php +++ b/module/project/view/doc.html.php @@ -44,8 +44,11 @@ id"); - $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + if(common::hasPriv('doc', 'delete')) + { + $deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->doc->delete}'"); + } ?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 40eb29112c..15df1f7aa2 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -87,8 +87,11 @@ $lang->testcase->batchCreate = $lang->testcase->create; if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list'); - $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->project->unlinkStory}'"); + if(common::hasPriv('project', 'unlinkStory')) + { + $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '', '', "class='link-icon' title='{$lang->project->unlinkStory}'"); + } ?> diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index ef57a97191..e5aef2901e 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -43,8 +43,11 @@ createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='link-icon' title='{$lang->project->unlinkMember}'"); + if (common::hasPriv('project', 'unlinkMember')) + { + $unlinkURL = $this->createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='link-icon' title='{$lang->project->unlinkMember}'"); + } ?> diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php index 64eba43c1b..dfddd5254d 100644 --- a/module/project/view/testtask.html.php +++ b/module/project/view/testtask.html.php @@ -46,8 +46,11 @@ common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + if(common::hasPriv('testtask', 'delete')) + { + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + } ?> diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index a50fb0e103..eeaf59d0d8 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -37,8 +37,11 @@ id", '', 'list'); - $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->release->delete}'"); + if(common::hasPriv('release', 'delete')) + { + $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->release->delete}'"); + } ?> diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 7ada661352..0d66855907 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -119,8 +119,11 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); common::printIcon('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); - $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + if(common::hasPriv('testcase', 'delete')) + { + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testcase->delete}'"); + } common::printIcon('testcase', 'createBug', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'createBug'); ?> diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 5e5668fec0..6109be7e8b 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -49,8 +49,11 @@ common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list'); common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list'); - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + if(common::hasPriv('testtask', 'delete')) + { + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "class='link-icon' title='{$lang->testtask->delete}'"); + } ?> diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 85e846f07d..a301e0583d 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -91,8 +91,11 @@ var moduleID = ''; common::printIcon('testtask', 'runCase', "id=$run->id", '', 'list', '', '', 'runCase'); common::printIcon('testtask', 'results', "id=$run->id", '', 'list', '', '', 'iframe'); - $unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '', '', "class='link-icon' title='{$lang->testtask->unlinkCase}'"); + if(common::hasPriv('testtask', 'unlinkCase')) + { + $unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '', '', "class='link-icon' title='{$lang->testtask->unlinkCase}'"); + } common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'createBug'); ?>