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

* Fix bug#43467.

Browse Source
This commit is contained in:
xieqiyu
2024-01-09 11:11:17 +08:00
parent c2460728ca
commit d97297fe3c
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+2 -2
View File
@@ -1970,7 +1970,7 @@ class story extends control
public function ajaxRelieveTwins()
{
$twinID = !empty($_POST['twinID']) ? $_POST['twinID'] : 0;
$story = $this->story->getByID($twinID);
$story = $this->story->getByID((int)$twinID);
$twins = explode(',', trim($story->twins, ','));
if(empty($story->twins)) return $this->send(array('result' => 'fail'));
@@ -1982,7 +1982,7 @@ class story extends control
/* Update twins to empty by twinID and if twins eq ','. */
$this->dao->update(TABLE_STORY)->set('twins')->eq('')->where('id')->eq($twinID)->orWhere('twins')->eq(',')->exec();
if(!dao::isError()) $this->loadModel('action')->create('story', $twinID, 'relieved');
if(!dao::isError()) $this->loadModel('action')->create('story', (int)$twinID, 'relieved');
return $this->send(array('result' => 'success', 'twinsCount' => count($twins)-1));
}
module/story/js/common.ui.js
+1 -1
View File
@@ -42,7 +42,7 @@ window.unlinkTwins = function(e)
const $ul = $this.closest('ul');
const postData = new FormData();
postData.append('twinID', $this.data('id'));
zui.Modal.confirm({message: relievedTwinsTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
zui.Modal.confirm({message: relievedTip, icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
{
if(res)
{
module/story/lang/de.php
+1 -1
View File
@@ -57,7 +57,7 @@ $lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link Requirement';
$lang->story->unlinkStory = 'Verknüpfung aufheben';
$lang->story->unlinkStory = "Verknüpfung aufheben {$lang->URCommon}";
$lang->story->linkStoriesAB = "Link {$lang->SRCommon}";
$lang->story->linkRequirementsAB = "Link {$lang->URCommon}";
$lang->story->export = "Daten exportieren";
module/story/lang/en.php
+1 -1
View File
@@ -57,7 +57,7 @@ $lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link Requirement';
$lang->story->unlinkStory = 'UnLinked';
$lang->story->unlinkStory = "UnLinked {$lang->URCommon}";
$lang->story->linkStoriesAB = "Link {$lang->SRCommon}";
$lang->story->linkRequirementsAB = "Link {$lang->URCommon}";
$lang->story->export = "Export Data";
module/story/lang/fr.php
+1 -1
View File
@@ -57,7 +57,7 @@ $lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Lier Requirement';
$lang->story->unlinkStory = 'Dissocier';
$lang->story->unlinkStory = "Dissocier {$lang->URCommon}";
$lang->story->linkStoriesAB = "Lier {$lang->SRCommon}";
$lang->story->linkRequirementsAB = "Lier {$lang->URCommon}";
$lang->story->export = "Exporter Données";
module/story/lang/zh-cn.php
+1 -1
View File
@@ -57,7 +57,7 @@ $lang->story->taskCountAB = 'T';
$lang->story->bugCountAB = 'B';
$lang->story->caseCountAB = 'C';
$lang->story->linkStory = "关联{$lang->URCommon}";
$lang->story->unlinkStory = "移除相关{$lang->SRCommon}";
$lang->story->unlinkStory = "移除相关{$lang->URCommon}";
$lang->story->linkStoriesAB = "关联相关{$lang->SRCommon}";
$lang->story->linkRequirementsAB = "关联相关{$lang->URCommon}";
$lang->story->export = "导出数据";
module/story/model.php
-1
View File
@@ -3758,7 +3758,6 @@ class storyModel extends model
$storyLang->deleteAction = str_replace($SRCommon, $URCommon, $storyLang->deleteAction);
$storyLang->view = str_replace($SRCommon, $URCommon, $storyLang->view);
$storyLang->linkStory = str_replace($SRCommon, $URCommon, $storyLang->linkStory);
$storyLang->unlinkStory = str_replace($SRCommon, $URCommon, $storyLang->unlinkStory);
$storyLang->exportAction = str_replace($SRCommon, $URCommon, $storyLang->exportAction);
$storyLang->zeroCase = str_replace($SRCommon, $URCommon, $storyLang->zeroCase);
$storyLang->zeroTask = str_replace($SRCommon, $URCommon, $storyLang->zeroTask);