diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index d36fd514be..33e9c60d5a 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -20,7 +20,7 @@
id='avatarForm' enctype='multipart/form-data'> - ', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->my->uploadAvatar}'");?> + ', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->my->uploadAvatar}'");?>
realname;?> diff --git a/module/story/control.php b/module/story/control.php index 814e3a8ca2..78df5d6ae0 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1988,20 +1988,23 @@ class story extends control * * @param int $executionID * @param int $productID + * @param int $branch + * @param int $moduleID * @param int $storyID * @param string $number - * @param string $type + * @param string $type full + * @param string $status all|unclosed * @access public * @return void */ - public function ajaxGetExecutionStories($executionID, $productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $number = '', $type= 'full') + public function ajaxGetExecutionStories($executionID, $productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $number = '', $type = 'full', $status = 'all') { if($moduleID) { $moduleID = $this->loadModel('tree')->getStoryModule($moduleID); $moduleID = $this->tree->getAllChildID($moduleID); } - $stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type); + $stories = $this->story->getExecutionStoryPairs($executionID, $productID, $branch, $moduleID, $type, $status); if($this->app->getViewType() === 'json') { return print(json_encode($stories)); diff --git a/module/story/model.php b/module/story/model.php index bd97909090..992dd8660b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3925,7 +3925,7 @@ class storyModel extends model } if($storyType == 'requirement') echo 'SR '; if($story->parent > 0 and isset($story->parentName)) $story->title = "{$story->parentName} / {$story->title}"; - if(isset($branches[$story->branch]) and $showBranch) echo "{$branches[$story->branch]} "; + if(isset($branches[$story->branch]) and $showBranch and $this->config->vision == 'rnd') echo "{$branches[$story->branch]} "; if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} "; if($story->parent > 0) echo '' . $this->lang->story->childrenAB . ' '; echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-app='$tab'") : "{$story->title}"; diff --git a/module/task/js/create.js b/module/task/js/create.js index 691e4817e5..4afe1f03e8 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -273,7 +273,7 @@ function loadModuleRelated() /* Get select of stories.*/ function setStories(moduleID, executionID) { - link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID); + link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID + '&storyID=0&number=&type=full&status=unclosed'); $.get(link, function(stories) { var storyID = $('#story').val();