Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/194_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #22562, and add language item of kanban.

See merge request easycorp/zentaopms!3583
This commit is contained in:
李玉春
2022-05-25 05:27:40 +00:00
parent 120743e044 6c97c84844
commit 016f55712d
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/lang/en.php
+4
View File
@@ -100,6 +100,8 @@ $lang->kanban->closedDate = 'Closed Date';
$lang->kanban->empty = 'No Kanban';
$lang->kanban->teamSumCount = '%s people in total';
$lang->kanban->cardCount = 'Card Count';
$lang->kanban->activatedBy = 'Activated By';
$lang->kanban->activatedDate = 'Activated Date';
$lang->kanban->createColumnOnLeft = 'Create Column On Left';
$lang->kanban->createColumnOnRight = 'Create Column On Right';
@@ -265,6 +267,8 @@ $lang->kanbanspace->lastEditedDate = 'Edited Date';
$lang->kanbanspace->closedBy = 'Closed By';
$lang->kanbanspace->closedDate = 'Closed Date';
$lang->kanbanspace->type = 'Type';
$lang->kanbanspace->activatedBy = 'Activated By';
$lang->kanbanspace->activatedDate = 'Activated Date';
$lang->kanbanspace->empty = 'No Space';
module/kanban/lang/zh-cn.php
+4
View File
@@ -100,6 +100,8 @@ $lang->kanban->closedDate = '关闭日期';
$lang->kanban->empty = '暂时没有看板';
$lang->kanban->teamSumCount = '共%s人';
$lang->kanban->cardCount = '卡片数量';
$lang->kanban->activatedBy = '由谁激活';
$lang->kanban->activatedDate = '激活日期';
$lang->kanban->createColumnOnLeft = '在左侧添加看板列';
$lang->kanban->createColumnOnRight = '在右侧添加看板列';
@@ -265,6 +267,8 @@ $lang->kanbanspace->lastEditedDate = '最后修改日期';
$lang->kanbanspace->closedBy = '由谁关闭';
$lang->kanbanspace->closedDate = '关闭日期';
$lang->kanbanspace->type = '空间类型';
$lang->kanbanspace->activatedBy = '由谁激活';
$lang->kanbanspace->activatedDate = '激活日期';
$lang->kanbanspace->empty = '暂时没有空间';
module/story/model.php
+4 -5
View File
@@ -437,9 +437,12 @@ class storyModel extends model
public function batchCreate($productID = 0, $branch = 0, $type = 'story')
{
$forceReview = $this->checkForceReview();
$reviewers = '';
foreach($_POST['title'] as $index => $value)
{
if($_POST['title'][$index] and isset($_POST['reviewer'][$index])) $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and empty($_POST['reviewDitto'][$index])) $reviewers = $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and !empty($_POST['reviewDitto'][$index])) $_POST['reviewer'][$index] = $reviewers;
if($_POST['title'][$index] and empty($_POST['reviewer'][$index]) and $forceReview)
{
dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
@@ -478,15 +481,11 @@ class storyModel extends model
$extendFields = $this->getFlowExtendFields();
$data = array();
$reviewers = '';
foreach($stories->title as $i => $title)
{
if(empty($title)) continue;
if(empty($stories->reviewer[$i]) and empty($stories->reviewerDitto[$i])) $stories->reviewer[$i] = array();
$reviewers = (isset($stories->reviewDitto[$i])) ? $reviewers : $stories->reviewer[$i];
$_POST['reviewer'][$i] = $reviewers;
$stories->reviewer[$i] = $reviewers;
$story = new stdclass();
$story->type = $type;