* Remove unlink method privilege of story, bug, testcase module.

This commit is contained in:
chenfeiCF
2018-07-13 10:04:39 +08:00
parent 413f7d48c3
commit 0e0fc2ae84
4 changed files with 27 additions and 12 deletions
-9
View File
@@ -191,7 +191,6 @@ $lang->resource->story->create = 'create';
$lang->resource->story->batchCreate = 'batchCreate';
$lang->resource->story->edit = 'edit';
$lang->resource->story->linkStory = 'linkStory';
$lang->resource->story->unlinkStory = 'unlinkStory';
$lang->resource->story->batchEdit = 'batchEdit';
$lang->resource->story->export = 'export';
$lang->resource->story->delete = 'delete';
@@ -234,7 +233,6 @@ $lang->story->methodOrder[90] = 'cases';
$lang->story->methodOrder[95] = 'zeroCase';
$lang->story->methodOrder[100] = 'report';
$lang->story->methodOrder[105] = 'linkStory';
$lang->story->methodOrder[110] = 'unlinkStory';
$lang->story->methodOrder[115] = 'batchChangeBranch';
$lang->story->methodOrder[120] = 'batchChangeModule';
@@ -485,7 +483,6 @@ $lang->resource->bug->batchConfirm = 'batchConfirm';
$lang->resource->bug->view = 'view';
$lang->resource->bug->edit = 'edit';
$lang->resource->bug->linkBugs = 'linkBugs';
$lang->resource->bug->unlinkBug = 'unlinkBug';
$lang->resource->bug->batchEdit = 'batchEdit';
$lang->resource->bug->batchClose = 'batchClose';
$lang->resource->bug->assignTo = 'assignTo';
@@ -530,7 +527,6 @@ $lang->bug->methodOrder[100] = 'saveTemplate';
$lang->bug->methodOrder[105] = 'deleteTemplate';
$lang->bug->methodOrder[110] = 'setPublic';
$lang->bug->methodOrder[115] = 'linkBugs';
$lang->bug->methodOrder[120] = 'unlinkBug';
$lang->bug->methodOrder[125] = 'batchChangeModule';
$lang->bug->methodOrder[130] = 'batchChangeBranch';
@@ -545,7 +541,6 @@ $lang->resource->testcase->createBug = 'createBug';
$lang->resource->testcase->view = 'view';
$lang->resource->testcase->edit = 'edit';
$lang->resource->testcase->linkCases = 'linkCases';
$lang->resource->testcase->unlinkCase = 'unlinkCase';
$lang->resource->testcase->batchEdit = 'batchEdit';
$lang->resource->testcase->delete = 'delete';
$lang->resource->testcase->batchDelete = 'batchDelete';
@@ -581,7 +576,6 @@ $lang->testcase->methodOrder[65] = 'batchDelete';
$lang->testcase->methodOrder[70] = 'batchChangeModule';
$lang->testcase->methodOrder[75] = 'batchChangeBranch';
$lang->testcase->methodOrder[80] = 'linkCases';
$lang->testcase->methodOrder[85] = 'unlinkCase';
$lang->testcase->methodOrder[90] = 'bugs';
$lang->testcase->methodOrder[95] = 'review';
$lang->testcase->methodOrder[100] = 'batchReview';
@@ -1311,11 +1305,8 @@ $lang->changelog['7.4.beta'][] = 'my-unbind';
$lang->changelog['8.0'][] = 'story-batchChangeBranch';
$lang->changelog['8.0.1'][] = 'bug-linkBugs';
$lang->changelog['8.0.1'][] = 'bug-unlinkBug';
$lang->changelog['8.0.1'][] = 'story-linkStory';
$lang->changelog['8.0.1'][] = 'story-unlinkStory';
$lang->changelog['8.0.1'][] = 'testcase-linkCases';
$lang->changelog['8.0.1'][] = 'testcase-unlinkCase';
$lang->changelog['8.1.3'][] = 'story-batchChangeModule';
$lang->changelog['8.1.3'][] = 'task-batchChangeModule';
+2 -2
View File
@@ -246,7 +246,7 @@
$linkStories = explode(',', $story->linkStories) ;
foreach($linkStories as $linkStoryID)
{
if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID", '', true), "#$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '</li>';
if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID", '', true), "#$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '</li>';
}
?>
</ul>
@@ -260,7 +260,7 @@
$childStories = explode(',', $story->childStories) ;
foreach($childStories as $childStoryID)
{
if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '</li>';
if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a($this->createLink('story', 'view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '</li>';
}
?>
</ul>
+1 -1
View File
@@ -22,7 +22,7 @@
</a>
<div class="divider"></div>
<div class="page-title">
<?php $rootName = $viewType == 'line' ? '' : $root->name;?>
<?php $rootName = $viewType == 'line' ? '' : $root->name;?>
<span class="text" title='<?php echo $rootName;?>'>
<?php
if($viewType == 'doc')
+24
View File
@@ -227,6 +227,7 @@ class upgradeModel extends model
case '10_0':
$this->execSQL($this->getUpgradeFile('10.0'));
$this->fixStorySpecTitle();
$this->removeUnlinkPriv();//Remove unlink privilege for story, bug and testcase module.
}
$this->deletePatch();
@@ -2366,4 +2367,27 @@ class upgradeModel extends model
return !dao::isError();
}
/**
* Remove unlink privilege for story, bug and testcase module.
*
* @access public
* @return bool
*/
public function removeUnlinkPriv()
{
$this->dao->delete()->from(TABLE_GROUPPRIV)
->where('((module')->eq('story')
->andWhere('method')->eq('unlinkStory')
->markRight(1)
->orWhere('(module')->eq('bug')
->andWhere('method')->eq('unlinkBug')
->markRight(1)
->orWhere('(module')->eq('testcase')
->andWhere('method')->eq('unlinkCase')
->markRight(2)
->exec();
return !dao::isError();
}
}