diff --git a/module/action/model.php b/module/action/model.php
index acd67125b3..4d11e6b4e6 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -473,7 +473,7 @@ class actionModel extends model
$action->extra = '';
if($names)
{
- foreach($names as $id => $name) $action->extra .= common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$id"), "#$id " . $name) . ', ' : "#$id " . $name . ', ';
+ foreach($names as $id => $name) $action->extra .= common::hasPriv('requriement', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$id"), "#$id " . $name) . ', ' : "#$id " . $name . ', ';
}
$action->extra = trim(trim($action->extra), ',');
}
@@ -1531,6 +1531,12 @@ class actionModel extends model
if(!empty($execution) and $execution->type == 'kanban') $action->objectLink = helper::createLink('execution', 'kanban', "executionID={$action->objectID}");
}
+ if($action->objectType == 'story')
+ {
+ $story = $this->loadModel('story')->getByID($action->objectID);
+ if(!empty($story)) $moduleName = $story->type;
+ }
+
if($action->objectType == 'doclib')
{
$docLib = $this->dao->select('type,product,project,execution,deleted')->from(TABLE_DOCLIB)->where('id')->eq($action->objectID)->fetch();
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 03352675bb..51ba347510 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -129,9 +129,11 @@
}
else
{
- $tab = '';
+ $tab = '';
+ $canView = common::hasPriv($module, $methodName);
if($action->objectType == 'meeting') $tab = $action->project ? "data-app='project'" : "data-app='my'";
- echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title='{$action->objectName}' $tab");
+ if($module == 'requirement') $module = 'story';
+ echo $canView ? html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title='{$action->objectName}' $tab") : "$action->objectName";
}
?>
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index ef080f6415..e5253115bf 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -89,8 +89,8 @@
pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> |
- title, null, "style='color: $story->color' data-group='product'");?>
- children)) echo '';;?>
+ title, null, "style='color: $story->color' data-group='product'") : "$story->title";?>
+ children)) echo '';?>
|
productTitle;?> |
openedBy);?> |
@@ -102,11 +102,11 @@
if($canBeChanged)
{
$vars = "story={$story->id}";
- echo common::buildIconButton('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true);
- echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true);
- echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
- echo common::buildIconButton('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
- echo common::buildIconButton('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
+ if(common::hasPriv('requirement', 'change')) echo common::buildIconButton('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true);
+ if(common::hasPriv('requirement', 'review')) echo common::buildIconButton('story', 'review', $vars, $story, 'list', 'search', '', 'iframe', true);
+ if(common::hasPriv('requirement', 'recall')) echo common::buildIconButton('story', 'recall', $vars, $story, 'list', 'undo', 'hiddenwin', '', '', '', $lang->story->recall);
+ if(common::hasPriv('requirement', 'close')) echo common::buildIconButton('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
+ if(common::hasPriv('requirement', 'edit')) echo common::buildIconButton('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
}
?>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 62d0ce8431..127bf1a156 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -47,6 +47,7 @@
+
createLink('story', 'view', "storyID=$story2Link->id");?>
@@ -55,10 +56,10 @@
- id));?>
+ id)) : sprintf('%03d', $story2Link->id);?>
| pri?>' title='story->priList, $story2Link->pri, $story2Link->pri);?>'>story->priList, $story2Link->pri, $story2Link->pri);?> |
- title, '_blank');?> |
+ title, '_blank') : $story2Link->title;?> |
processStatus('story', $story2Link);?> |
type == 'requirement'):?>
story->stageList, $story2Link->stage);?> |
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index 75cf44858c..7a515e738e 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -56,15 +56,17 @@
$requirement):?>
- track;?>
+ track;?>
+ story->noRequirement;?>
URAndSR):?>
| class='requirement' title='title : $lang->story->noRequirement;?>'>
story->statusList, $requirement->status);?>
+ type, 'view') ? html::a($this->createLink('story', 'view', "storyID=$requirement->id"), $requirement->title, '', "title=$requirement->title data-app='$tab'") : $requirement->title;?>
- story->noRequirement : html::a($this->createLink($module, 'view', "storyID=$requirement->id"), $requirement->title, '', "title=$requirement->title data-app='$tab'");?>
+
|
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 5aaa53cc35..a09a2949eb 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -403,10 +403,11 @@
type == 'story' ? common::hasPriv('requirement', 'view') : common::hasPriv('story', 'view');
foreach($relations as $item) $relation[$item->id] = $item->title;
foreach($relation as $id => $title)
{
- echo "- " . html::a($this->createLink('story', 'view', "id=$id&version=0¶m=0&storyType=$story->type", '', true), "#$id $title", '', "class='iframe' data-width='80%'");
+ echo "
- " . ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id&version=0¶m=0&storyType=$story->type", '', true), "#$id $title", '', "class='iframe' data-width='80%'") : "#$id $title");
echo html::a($this->createLink('story', 'linkStory', "storyID=$story->id&type=remove&linkedID=$id"), '', 'hiddenwin', "class='deleter hide removeButton'");
}
?>