From 49ea5179a63d2298a01fac41d1803b4a9727092a Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 2 Sep 2020 13:47:19 +0800 Subject: [PATCH] * Edit comment. --- module/design/control.php | 2 ++ module/design/lang/en.php | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index c22d462985..d921ccb811 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -291,6 +291,7 @@ class design extends control else { $this->design->unlinkCommit($designID, $commitID); + die(js::reload('parent')); } } @@ -353,6 +354,7 @@ class design extends control $this->design->delete(TABLE_DESIGN, $designID); $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('design')->andWhere('AID')->eq($designID)->andWhere('Btype')->eq('commit')->andwhere('relation')->eq('completedin')->exec(); $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('commit')->andWhere('BID')->eq($designID)->andWhere('Btype')->eq('design')->andwhere('relation')->eq('completedfrom')->exec(); + die(js::locate($this->session->designList, 'parent')); } } diff --git a/module/design/lang/en.php b/module/design/lang/en.php index 7c9ada42ac..6baaa81b8c 100644 --- a/module/design/lang/en.php +++ b/module/design/lang/en.php @@ -9,7 +9,7 @@ * @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -/* Field list. */ +/* 字段列表. */ $lang->design->id = 'ID'; $lang->design->name = 'Name'; $lang->design->story = 'Story'; @@ -37,7 +37,7 @@ $lang->design->createdDate = 'CreatedDate'; $lang->design->basicInfo = 'Basic Information'; $lang->design->noAssigned = 'Unassigned'; -/* Action list. */ +/* 动作列表. */ $lang->design->common = 'Design'; $lang->design->create = 'Create Design'; $lang->design->batchCreate = 'Batch Create'; @@ -52,7 +52,7 @@ $lang->design->submit = 'Submit Review'; $lang->design->assignTo = 'Assign'; $lang->design->revision = 'Linked Code'; -/* Field value. */ +/* 字段取值. */ $lang->design->typeList = array(); $lang->design->typeList[''] = ''; $lang->design->typeList['HLDS'] = 'High-Level'; @@ -67,7 +67,7 @@ $lang->design->rangeList['assign'] = 'Selected'; $lang->design->featureBar['all'] = 'All'; $lang->design->featureBar += $lang->design->typeList; -/* Prompt information. */ +/* 提示信息. */ $lang->design->errorSelection = 'No record selected!'; $lang->design->noDesign = 'No record.'; $lang->design->noCommit = 'No record commited.';