diff --git a/module/custom/control.php b/module/custom/control.php index 909153542d..dc159ba0c6 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -163,7 +163,7 @@ class custom extends control foreach($_POST['keys'] as $index => $key) { if(!empty($key)) $key = trim($key); - /* Invalid key. It should be numbers. (It includes severityList in bug module and priList in stroy, task, bug, testcasea, testtask and todo module.) */ + /* Invalid key. It should be numbers. (It includes severityList in bug module and priList in story, task, bug, testcasea, testtask and todo module.) */ if($field == 'priList' or $field == 'severityList') { if(!is_numeric($key) or $key > 255) return $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidNumberKey)); diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index a5eb1b22c4..c03748f81b 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -799,7 +799,7 @@ function createColumnCreateMenu(options) if(col.laneType == 'story') { if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID, '', true), className: 'iframe'}); - if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}}); + if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStory, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}}); if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}}); if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal'}}); } diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 4f5db62636..2907121fc4 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -110,7 +110,7 @@ class projectStory extends control * Batch unlink story. * * @param int $projectID - * @param string $stroyIdList + * @param string $storyIdList * @access public * @return string */ diff --git a/module/story/model.php b/module/story/model.php index 992dd8660b..ced0c50d4e 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -647,9 +647,9 @@ class storyModel extends model $story = fixer::input('post')->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)->get(); - $oldStroyReviewers = $this->getReviewerPairs($storyID, $oldStory->version); + $oldStoryReviewers = $this->getReviewerPairs($storyID, $oldStory->version); $_POST['reviewer'] = isset($_POST['reviewer']) ? $_POST['reviewer'] : array(); - $reviewerHasChanged = (array_diff(array_keys($oldStroyReviewers), $_POST['reviewer']) or array_diff($_POST['reviewer'], array_keys($oldStroyReviewers))); + $reviewerHasChanged = (array_diff(array_keys($oldStoryReviewers), $_POST['reviewer']) or array_diff($_POST['reviewer'], array_keys($oldStoryReviewers))); if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or $this->loadModel('file')->getCount() or $reviewerHasChanged) $specChanged = true; $now = helper::now();