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

* revert dynamicAction lang.

Browse Source
This commit is contained in:
wangyidong
2019-06-13 14:11:56 +08:00
parent a439ef9a26
commit dcac58b007
4 changed files with 142 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+139 -139
View File
@@ -211,151 +211,151 @@ $lang->action->label->managed = "managed";
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass;
$lang->action->dynamicAction->todo['opened'] = 'created a todo';
$lang->action->dynamicAction->todo['edited'] = 'edited a todo';
$lang->action->dynamicAction->todo['erased'] = 'deleted a todo';
$lang->action->dynamicAction->todo['finished'] = 'finished a todo';
$lang->action->dynamicAction->todo['activated'] = 'activated a todo';
$lang->action->dynamicAction->todo['closed'] = 'closed a todo';
$lang->action->dynamicAction->todo['deleted'] = 'deleted a todo';
$lang->action->dynamicAction->todo['assigned'] = 'assigned a todo';
$lang->action->dynamicAction->todo['undeleted'] = 'restored a todo';
$lang->action->dynamicAction->todo['hidden'] = 'Hid a todo';
$lang->action->dynamicAction->todo['opened'] = 'Create Todo';
$lang->action->dynamicAction->todo['edited'] = 'Edit Todo';
$lang->action->dynamicAction->todo['erased'] = 'Delete Todo';
$lang->action->dynamicAction->todo['finished'] = 'Finish Todo';
$lang->action->dynamicAction->todo['activated'] = 'Activate Todo';
$lang->action->dynamicAction->todo['closed'] = 'Close Todo';
$lang->action->dynamicAction->todo['deleted'] = 'Delete Todo';
$lang->action->dynamicAction->todo['assigned'] = 'Assign Todo';
$lang->action->dynamicAction->todo['undeleted'] = 'Restore Todo';
$lang->action->dynamicAction->todo['hidden'] = 'Hide Todo';
$lang->action->dynamicAction->product['opened'] = 'created a ' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = 'edited a ' . $lang->productCommon;
$lang->action->dynamicAction->product['deleted'] = 'deleted a ' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = 'closed a ' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = 'restored a ' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = 'hid a ' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = 'created a plan';
$lang->action->dynamicAction->productplan['edited'] = 'edited a plan';
$lang->action->dynamicAction->release['opened'] = 'created a release';
$lang->action->dynamicAction->release['edited'] = 'edited a release';
$lang->action->dynamicAction->release['changestatus'] = 'changed release status';
$lang->action->dynamicAction->release['undeleted'] = 'restored a release';
$lang->action->dynamicAction->release['hidden'] = 'hid a release';
$lang->action->dynamicAction->story['opened'] = 'created a story';
$lang->action->dynamicAction->story['edited'] = 'edited a story';
$lang->action->dynamicAction->story['activated'] = 'activated a story';
$lang->action->dynamicAction->story['reviewed'] = 'reviewed a story';
$lang->action->dynamicAction->story['closed'] = 'closed a story';
$lang->action->dynamicAction->story['assigned'] = 'assigned a story';
$lang->action->dynamicAction->story['changed'] = 'changed a story';
$lang->action->dynamicAction->story['linked2plan'] = 'linked to a plan';
$lang->action->dynamicAction->story['unlinkedfromplan'] = 'unlinked from a plan';
$lang->action->dynamicAction->story['linked2release'] = 'linked to a release';
$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'unlinked from a plan';
$lang->action->dynamicAction->story['linked2build'] = 'linked to a build';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = 'unlinked from a build';
$lang->action->dynamicAction->story['unlinkedfromproject'] = 'unlinked a project';
$lang->action->dynamicAction->story['undeleted'] = 'restored a story';
$lang->action->dynamicAction->story['hidden'] = 'hid a story';
$lang->action->dynamicAction->product['opened'] = 'Create ' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = 'Edit ' . $lang->productCommon;
$lang->action->dynamicAction->product['deleted'] = 'Delete ' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = 'Close ' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = 'Restore ' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = 'Hide ' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = 'Create Plan';
$lang->action->dynamicAction->productplan['edited'] = 'Edit Plan';
$lang->action->dynamicAction->release['opened'] = 'Create Release';
$lang->action->dynamicAction->release['edited'] = 'Edit Release';
$lang->action->dynamicAction->release['changestatus'] = 'Change Release Status';
$lang->action->dynamicAction->release['undeleted'] = 'Restore Release';
$lang->action->dynamicAction->release['hidden'] = 'Hide Release';
$lang->action->dynamicAction->story['opened'] = 'Create Story';
$lang->action->dynamicAction->story['edited'] = 'Edit Story';
$lang->action->dynamicAction->story['activated'] = 'Activate Story';
$lang->action->dynamicAction->story['reviewed'] = 'Review Story';
$lang->action->dynamicAction->story['closed'] = 'Close Story';
$lang->action->dynamicAction->story['assigned'] = 'Assign Story';
$lang->action->dynamicAction->story['changed'] = 'Change Story';
$lang->action->dynamicAction->story['linked2plan'] = 'Link Story to Plan';
$lang->action->dynamicAction->story['unlinkedfromplan'] = 'Unlink Story from Plan';
$lang->action->dynamicAction->story['linked2release'] = 'Link Story to Release';
$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Unlink Story from Plan';
$lang->action->dynamicAction->story['linked2build'] = 'Link Story to Build';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = 'Unlink Story from Build';
$lang->action->dynamicAction->story['unlinkedfromproject'] = 'Unlink Project';
$lang->action->dynamicAction->story['undeleted'] = 'Restore Story';
$lang->action->dynamicAction->story['hidden'] = 'Hide Story';
$lang->action->dynamicAction->project['opened'] = 'created a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['edited'] = 'edited a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['deleted'] = 'deleted a' . $lang->projectCommon;
$lang->action->dynamicAction->project['started'] = 'started a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['delayed'] = 'delayed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['suspended'] = 'suspended a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['activated'] = 'activated a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['closed'] = 'closed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['managed'] = 'managed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['undeleted'] = 'restored a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['hidden'] = 'hid a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['moved'] = 'improted a task';
$lang->action->dynamicAction->task['opened'] = 'created a task';
$lang->action->dynamicAction->task['edited'] = 'edited a task';
$lang->action->dynamicAction->task['commented'] = 'commented a task';
$lang->action->dynamicAction->task['assigned'] = 'assigned a task';
$lang->action->dynamicAction->task['confirmed'] = 'confirmed a task';
$lang->action->dynamicAction->task['started'] = 'started a task';
$lang->action->dynamicAction->task['finished'] = 'finished a task';
$lang->action->dynamicAction->task['recordestimate'] = 'added estimates';
$lang->action->dynamicAction->task['editestimate'] = 'edited estimates';
$lang->action->dynamicAction->task['deleteestimate'] = 'delete estimates';
$lang->action->dynamicAction->task['paused'] = 'paused a task';
$lang->action->dynamicAction->task['closed'] = 'closed a task';
$lang->action->dynamicAction->task['canceled'] = 'cancelled a task';
$lang->action->dynamicAction->task['activated'] = 'activated a task';
$lang->action->dynamicAction->task['createchildren'] = 'created a child task';
$lang->action->dynamicAction->task['unlinkparenttask'] = 'unlinked a parent task';
$lang->action->dynamicAction->task['linkparenttask'] = 'linked a parent task';
$lang->action->dynamicAction->task['linkchildtask'] = 'linked a child task';
$lang->action->dynamicAction->task['undeleted'] = 'restored a task';
$lang->action->dynamicAction->task['hidden'] = 'Hid a task';
$lang->action->dynamicAction->task['svncommited'] = 'SVN commited';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT commited';
$lang->action->dynamicAction->build['opened'] = 'created a build';
$lang->action->dynamicAction->build['edited'] = 'edited a build';
$lang->action->dynamicAction->project['opened'] = 'Create ' . $lang->projectCommon;
$lang->action->dynamicAction->project['edited'] = 'Edit ' . $lang->projectCommon;
$lang->action->dynamicAction->project['deleted'] = 'Delete ' . $lang->projectCommon;
$lang->action->dynamicAction->project['started'] = 'Start ' . $lang->projectCommon;
$lang->action->dynamicAction->project['delayed'] = 'Delay ' . $lang->projectCommon;
$lang->action->dynamicAction->project['suspended'] = 'Suspend ' . $lang->projectCommon;
$lang->action->dynamicAction->project['activated'] = 'Activate ' . $lang->projectCommon;
$lang->action->dynamicAction->project['closed'] = 'Close ' . $lang->projectCommon;
$lang->action->dynamicAction->project['managed'] = 'Manage ' . $lang->projectCommon;
$lang->action->dynamicAction->project['undeleted'] = 'Restore ' . $lang->projectCommon;
$lang->action->dynamicAction->project['hidden'] = 'Hide ' . $lang->projectCommon;
$lang->action->dynamicAction->project['moved'] = 'Improt Task';
$lang->action->dynamicAction->task['opened'] = 'Create Task';
$lang->action->dynamicAction->task['edited'] = 'Edit Task';
$lang->action->dynamicAction->task['commented'] = 'Task Comment';
$lang->action->dynamicAction->task['assigned'] = 'Assign Task';
$lang->action->dynamicAction->task['confirmed'] = 'Confirm Task';
$lang->action->dynamicAction->task['started'] = 'Start Task';
$lang->action->dynamicAction->task['finished'] = 'Finish Task';
$lang->action->dynamicAction->task['recordestimate'] = 'Add Estimates';
$lang->action->dynamicAction->task['editestimate'] = 'Edit Estimates';
$lang->action->dynamicAction->task['deleteestimate'] = 'Delete Estimates';
$lang->action->dynamicAction->task['paused'] = 'Pause Task';
$lang->action->dynamicAction->task['closed'] = 'Close Task';
$lang->action->dynamicAction->task['canceled'] = 'Cancel Task';
$lang->action->dynamicAction->task['activated'] = 'Activate Task';
$lang->action->dynamicAction->task['createchildren'] = 'Create Child Task';
$lang->action->dynamicAction->task['unlinkparenttask'] = 'Unlink Parent Task';
$lang->action->dynamicAction->task['linkparenttask'] = 'Link Parent Task';
$lang->action->dynamicAction->task['linkchildtask'] = 'Link Child Task';
$lang->action->dynamicAction->task['undeleted'] = 'Restore Task';
$lang->action->dynamicAction->task['hidden'] = 'Hide Task';
$lang->action->dynamicAction->task['svncommited'] = 'SVN Commit';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT Commit';
$lang->action->dynamicAction->build['opened'] = 'Create Build';
$lang->action->dynamicAction->build['edited'] = 'Edit Build';
$lang->action->dynamicAction->bug['opened'] = 'reported a bug';
$lang->action->dynamicAction->bug['edited'] = 'edited a bug';
$lang->action->dynamicAction->bug['activated'] = 'activated a bug';
$lang->action->dynamicAction->bug['assigned'] = 'assigned a bug';
$lang->action->dynamicAction->bug['closed'] = 'closed a bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = 'confirmed a bug';
$lang->action->dynamicAction->bug['resolved'] = 'resolved a bug';
$lang->action->dynamicAction->bug['undeleted'] = 'restored a bug';
$lang->action->dynamicAction->bug['hidden'] = 'hid a bug';
$lang->action->dynamicAction->bug['confirmed'] = 'confirmed story change';
$lang->action->dynamicAction->bug['tostory'] = 'converted to a story';
$lang->action->dynamicAction->bug['totask'] = 'converted to a task';
$lang->action->dynamicAction->bug['linked2plan'] = 'linked a plan';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = 'unlinked from a plan';
$lang->action->dynamicAction->bug['linked2release'] = 'linked a release';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = 'unlinked from a plan';
$lang->action->dynamicAction->bug['linked2bug'] = 'linked a build';
$lang->action->dynamicAction->bug['unlinkedfrombuild'] = 'unlinked a build';
$lang->action->dynamicAction->testtask['opened'] = 'created a test request';
$lang->action->dynamicAction->testtask['edited'] = 'edited a test request';
$lang->action->dynamicAction->testtask['started'] = 'started a test request';
$lang->action->dynamicAction->testtask['activated'] = 'activated a test request';
$lang->action->dynamicAction->testtask['closed'] = 'closes a test request';
$lang->action->dynamicAction->testtask['blocked'] = 'blocked a test request';
$lang->action->dynamicAction->case['opened'] = 'created a case';
$lang->action->dynamicAction->case['edited'] = 'edited a case';
$lang->action->dynamicAction->case['deleted'] = 'deleted a case';
$lang->action->dynamicAction->case['undeleted'] = 'restored a case';
$lang->action->dynamicAction->case['hidden'] = 'hid a case';
$lang->action->dynamicAction->case['reviewed'] = 'added a review result';
$lang->action->dynamicAction->case['confirmed'] = 'confirmed a case';
$lang->action->dynamicAction->case['fromlib'] = 'imported from a case library';
$lang->action->dynamicAction->testreport['opened'] = 'created a testing report';
$lang->action->dynamicAction->testreport['edited'] = 'edited a testing report';
$lang->action->dynamicAction->testreport['deleted'] = 'deleted a testing report';
$lang->action->dynamicAction->testreport['undeleted'] = 'restored a testing report';
$lang->action->dynamicAction->testreport['hidden'] = 'hid testing report';
$lang->action->dynamicAction->testsuite['opened'] = 'created a test suite';
$lang->action->dynamicAction->testsuite['edited'] = 'edited a test suite';
$lang->action->dynamicAction->testsuite['deleted'] = 'deleted a test suite';
$lang->action->dynamicAction->testsuite['undeleted'] = 'restored a test suite';
$lang->action->dynamicAction->testsuite['hidden'] = 'hid a test suite';
$lang->action->dynamicAction->caselib['opened'] = 'created a case library';
$lang->action->dynamicAction->caselib['edited'] = 'edited a case library';
$lang->action->dynamicAction->caselib['deleted'] = 'deleted a case library';
$lang->action->dynamicAction->caselib['undeleted'] = 'restored a case library';
$lang->action->dynamicAction->caselib['hidden'] = 'hid a case library';
$lang->action->dynamicAction->bug['opened'] = 'Report Bug';
$lang->action->dynamicAction->bug['edited'] = 'Edit Bug';
$lang->action->dynamicAction->bug['activated'] = 'Activate Bug';
$lang->action->dynamicAction->bug['assigned'] = 'Assign Bug';
$lang->action->dynamicAction->bug['closed'] = 'Close Bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirm Bug';
$lang->action->dynamicAction->bug['resolved'] = 'Solve Bug';
$lang->action->dynamicAction->bug['undeleted'] = 'Restore Bug';
$lang->action->dynamicAction->bug['hidden'] = 'Hide Bug';
$lang->action->dynamicAction->bug['confirmed'] = 'Confirm Story Change';
$lang->action->dynamicAction->bug['tostory'] = 'Convert to Story';
$lang->action->dynamicAction->bug['totask'] = 'Convert to Task';
$lang->action->dynamicAction->bug['linked2plan'] = 'Link Plan';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = 'Unlink Plan';
$lang->action->dynamicAction->bug['linked2release'] = 'Link Release';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = 'Unlink Plan';
$lang->action->dynamicAction->bug['linked2bug'] = 'Link Build';
$lang->action->dynamicAction->bug['unlinkedfrombuild'] = 'Unlink Build';
$lang->action->dynamicAction->testtask['opened'] = 'Create Test Request';
$lang->action->dynamicAction->testtask['edited'] = 'Edit Test Request';
$lang->action->dynamicAction->testtask['started'] = 'Start Test Request';
$lang->action->dynamicAction->testtask['activated'] = 'Activate Test Request';
$lang->action->dynamicAction->testtask['closed'] = 'Close Test Request';
$lang->action->dynamicAction->testtask['blocked'] = 'Blocked Test Request';
$lang->action->dynamicAction->case['opened'] = 'Create Case';
$lang->action->dynamicAction->case['edited'] = 'Edit Case';
$lang->action->dynamicAction->case['deleted'] = 'Delete Case';
$lang->action->dynamicAction->case['undeleted'] = 'Restore Case';
$lang->action->dynamicAction->case['hidden'] = 'Hide Case';
$lang->action->dynamicAction->case['reviewed'] = 'Add Review Result';
$lang->action->dynamicAction->case['confirmed'] = 'Confirm Case';
$lang->action->dynamicAction->case['fromlib'] = 'Import from Case Lib';
$lang->action->dynamicAction->testreport['opened'] = 'Create Test Report';
$lang->action->dynamicAction->testreport['edited'] = 'Edit Test Report';
$lang->action->dynamicAction->testreport['deleted'] = 'Delete Test Report';
$lang->action->dynamicAction->testreport['undeleted'] = 'Restore Test Report';
$lang->action->dynamicAction->testreport['hidden'] = 'Hide Test Report';
$lang->action->dynamicAction->testsuite['opened'] = 'Create Test Suite';
$lang->action->dynamicAction->testsuite['edited'] = 'Edit Test Suite';
$lang->action->dynamicAction->testsuite['deleted'] = 'Delete Test Suite';
$lang->action->dynamicAction->testsuite['undeleted'] = 'Restore Test Suite';
$lang->action->dynamicAction->testsuite['hidden'] = 'Hide Test Suite';
$lang->action->dynamicAction->caselib['opened'] = 'Create Case Lib';
$lang->action->dynamicAction->caselib['edited'] = 'Edit Case Lib';
$lang->action->dynamicAction->caselib['deleted'] = 'Delete Case Lib';
$lang->action->dynamicAction->caselib['undeleted'] = 'Restore Case Lib';
$lang->action->dynamicAction->caselib['hidden'] = 'Hide Case Lib';
$lang->action->dynamicAction->doclib['created'] = 'created a document library';
$lang->action->dynamicAction->doclib['edited'] = 'edited a document library';
$lang->action->dynamicAction->doc['created'] = 'created a document';
$lang->action->dynamicAction->doc['edited'] = 'edited a document';
$lang->action->dynamicAction->doc['commented'] = 'commented a document';
$lang->action->dynamicAction->doc['deleted'] = 'deleted a document';
$lang->action->dynamicAction->doc['undeleted'] = 'restored a document';
$lang->action->dynamicAction->doc['hidden'] = 'hide a document';
$lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
$lang->action->dynamicAction->doclib['edited'] = 'Edit Doc Library';
$lang->action->dynamicAction->doc['created'] = 'Create Document';
$lang->action->dynamicAction->doc['edited'] = 'Edit Document';
$lang->action->dynamicAction->doc['commented'] = 'Comment Document';
$lang->action->dynamicAction->doc['deleted'] = 'Delete Document';
$lang->action->dynamicAction->doc['undeleted'] = 'Restore Document';
$lang->action->dynamicAction->doc['hidden'] = 'Hide Document';
$lang->action->dynamicAction->user['created'] = 'create a user';
$lang->action->dynamicAction->user['edited'] = 'edited au user';
$lang->action->dynamicAction->user['login'] = 'login';
$lang->action->dynamicAction->user['logout'] = 'logout';
$lang->action->dynamicAction->user['undeleted'] = 'restored user';
$lang->action->dynamicAction->user['hidden'] = 'hid a user';
$lang->action->dynamicAction->user['loginxuanxuan'] = 'login Xuan';
$lang->action->dynamicAction->user['created'] = 'Create User';
$lang->action->dynamicAction->user['edited'] = 'Edit User';
$lang->action->dynamicAction->user['login'] = 'User Login';
$lang->action->dynamicAction->user['logout'] = 'User Logout';
$lang->action->dynamicAction->user['undeleted'] = 'Restore User';
$lang->action->dynamicAction->user['hidden'] = 'Hide User';
$lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Xuan';
$lang->action->dynamicAction->entry['created'] = 'edited an application';
$lang->action->dynamicAction->entry['edited'] = 'edited an application';
$lang->action->dynamicAction->entry['created'] = 'Add Application';
$lang->action->dynamicAction->entry['edited'] = 'Edit Application';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
module/doc/view/createlib.html.php
+1 -2
View File
@@ -45,8 +45,7 @@
<td>
<span><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
<span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib']['product']['default'];?></span>
</td>
</tr>
</td>
</tr>
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList;?></th>
module/project/view/story.html.php
+1 -1
View File
@@ -104,7 +104,7 @@
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<?php if($canOrder):?>
<th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
<th class='w-60px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
<?php endif;?>
<th class='c-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name {sorter:false}'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
module/task/model.php
+1 -1
View File
@@ -406,7 +406,7 @@ class taskModel extends model
{
$childTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
if(empty($parentID)) $parentID = $childTask->parent;
if(empty($parentID)) return true;
if($parentID <= 0) return true;
$this->computeWorkingHours($parentID);