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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-07-09 10:23:03 +08:00
parent 3190c876d0 9552cc6fd3
commit abc1c41928
19 changed files with 58 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/lang/en.php
+1 -1
View File
@@ -34,7 +34,7 @@ $lang->block->assignToMe = 'Assign To Me';
$lang->block->lblFlowchart = 'Workflow';
$lang->block->welcome = 'Welcome';
$lang->block->leftToday = 'Work for Today';
$lang->block->leftToday = 'Works for Today';
$lang->block->myTask = 'My Task';
$lang->block->myStory = 'My Story';
$lang->block->myBug = 'My Bug';
module/block/view/flowchart.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<tr class='text-middle'>
<?php for($i = 0; $i < 6; $i++):?>
<?php if($i == 0):?>
<th><span class="flowchart-title"><?php echo $lang->block->role?></span></th>
<th style='width:110px;'><span class="flowchart-title"><?php echo $lang->block->role?></span></th>
<?php else:?>
<th><div><span class="flowchart-step bg-secondary"><?php echo $i?></span></div></th>
<?php endif;?>
module/bug/lang/en.php
+4 -4
View File
@@ -109,7 +109,7 @@ $lang->bug->resolvedByMe = 'ResolvedByMe';
$lang->bug->closedByMe = 'ClosedByMe';
$lang->bug->assignToNull = 'Unassigned';
$lang->bug->unResolved = 'Unresolved';
$lang->bug->toClosed = 'ToBeClosed';
$lang->bug->toClosed = 'Unclosed';
$lang->bug->unclosed = 'Active';
$lang->bug->unconfirmed = 'UnConfirmed';
$lang->bug->longLifeBugs = 'Pending';
@@ -167,7 +167,7 @@ $lang->bug->remindTask = 'This Bug has been converted to Task. Do you
$lang->bug->skipClose = 'Bug %s is not resolved. You cannot close it.';
$lang->bug->applyTemplate = 'Template';
$lang->bug->confirmDeleteTemplate = 'Do you want to delete this template?';
$lang->bug->hasSubmittedTest = 'Development has submitted test application,';
$lang->bug->hasSubmittedTest = 'Developer has submitted test task,';
$lang->bug->nowToTest = 'Now to test';
/* 模板。*/
@@ -252,8 +252,8 @@ $lang->bug->statusList['active'] = 'Active';
$lang->bug->statusList['resolved'] = 'Resolved';
$lang->bug->statusList['closed'] = 'Closed';
$lang->bug->confirmedList[1] = 'Yes';
$lang->bug->confirmedList[0] = 'No';
$lang->bug->confirmedList[1] = 'Confirmed';
$lang->bug->confirmedList[0] = 'Unconfirmed';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = 'As Design';
module/install/lang/en.php
+7 -6
View File
@@ -25,14 +25,15 @@ $lang->install->seeLatestRelease = 'View Latest Version';
$lang->install->welcome = 'Thanks for choosing ZenTao Project Management Software!';
$lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2';
$lang->install->desc = <<<EOT
ZenTao Project Management Software is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> license. It integrates with Product Management, Project Management, QA Management, Document Management, To-Dos Management, Company Management etc. ZenTao is the best choice for software project management.
ZenTao Project Management Software is an Open Source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> license. It integrates with Product Management, Project Management, QA Management, Document Management, Todos Management, Company Management etc. ZenTao is the best choice for software project management.
ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for your requirements.
ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independent framework developed by our team. Third party developers/organizations can develop extensions or customize for their requirements.
EOT;
$lang->install->links = <<<EOT
ZenTao PMS is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
Official Website <a href='http://www.zentao.pm' target='_blank'>http://www.zentao.pm</a>
Technical Support <a href='http://www.zentao.pm/ask/' target='_blank'>http://www.zentao.pm/ask/</a>
Official Website : <a href='http://www.zentao.pm' target='_blank'>http://www.zentao.pm</a>
Technical Support : <a href='http://www.zentao.pm/forum/' target='_blank'>http://www.zentao.pm/forum/</a>
WhatsApp Group : <a href='https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF' target='_blank'>https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF</a>
Twitter: <a href='https://twitter.com/cneasysoft' target='_blank'>cneasysoft</a>
You are installing ZenTao <strong class='text-danger'>%s</strong> Version.
@@ -97,7 +98,7 @@ $lang->install->dbName = 'Database Name';
$lang->install->dbPrefix = 'Table Prefix';
$lang->install->clearDB = 'Clean tables if already exist.';
$lang->install->importDemoData = 'Import Demo Data';
$lang->install->working = 'Working way';
$lang->install->working = 'Work Mode';
$lang->install->requestTypes['GET'] = 'GET';
$lang->install->requestTypes['PATH_INFO'] = 'PATH_INFO';
@@ -167,7 +168,7 @@ $lang->install->login = 'Login ZenTao';
$lang->install->register = 'Register in ZenTao';
$lang->install->joinZentao = <<<EOT
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
EOT;
$lang->install->product = array('chanzhi', 'ranzhi');
module/install/view/step4.html.php
+2 -2
View File
@@ -46,8 +46,8 @@
<form method='post' target='hiddenwin'>
<table class='table table-form mw-400px' style='margin: 0 auto'>
<tr>
<th class='w-100px'><?php echo $lang->install->company;?></th>
<td><?php echo html::input('company', '', "class='form-control' autocomplete='off'");?></td>
<th class='w-200px'><?php echo $lang->install->company;?></th>
<td class='w-300px'><?php echo html::input('company', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th><?php echo $lang->install->working;?></th>
module/product/lang/en.php
+1 -1
View File
@@ -74,7 +74,7 @@ $lang->product->qa = 'QA';
$lang->product->release = 'Release';
$lang->product->latestDynamic = 'Dynamic';
$lang->product->plan = 'Plan';
$lang->product->iteration = 'Iteration';
$lang->product->iteration = 'Version Iteration';
$lang->product->iterationInfo = '%s Iterations';
$lang->product->iterationView = 'Details';
module/project/lang/en.php
+3 -3
View File
@@ -58,7 +58,7 @@ $lang->project->product = $lang->project->products;
$lang->project->readjustTime = 'Adjust project begin and end time';
$lang->project->readjustTask = 'Adjust task start date and deadline';
$lang->project->effort = 'Effort';
$lang->project->relatedMember = 'Related Member';
$lang->project->relatedMember = 'Team Members';
$lang->project->start = 'Start';
$lang->project->activate = 'Activate';
@@ -143,7 +143,7 @@ $lang->project->batchUnlinkStory = 'Batch Unlink Story';
$lang->project->importTask = 'Import Tasks';
$lang->project->importPlanStories = 'Link Story From Plan';
$lang->project->importBug = 'Import Bugs';
$lang->project->updateOrder = 'Order';
$lang->project->updateOrder = 'Sort';
$lang->project->tree = 'Tree';
$lang->project->storyKanban = 'Story Kanban';
$lang->project->storySort = 'Sort Story';
@@ -175,7 +175,7 @@ $lang->project->groups['closedBy'] = 'By ClosedBy';
$lang->project->groups['type'] = 'By Type';
$lang->project->groupFilter['story']['all'] = $lang->project->all;
$lang->project->groupFilter['story']['linked'] = 'Task Linked to Story';
$lang->project->groupFilter['story']['linked'] = 'Tasks Linked to Story';
$lang->project->groupFilter['pri']['all'] = $lang->project->all;
$lang->project->groupFilter['pri']['noset'] = 'Not set';
$lang->project->groupFilter['assignedTo']['undone'] = 'Unfinished';
module/project/view/team.html.php
+2 -2
View File
@@ -52,8 +52,8 @@
<th><?php echo $lang->team->days;?></th>
<th><?php echo $lang->team->hours;?></th>
<th><?php echo $lang->team->totalHours;?></th>
<th class='w-80px text-center'><?php echo $lang->team->limited;?></th>
<th class='c-actions-1'><?php echo $lang->actions;?></th>
<th class='w-100px text-center'><?php echo $lang->team->limited;?></th>
<th class='c-actions-1 w-80px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/release/lang/en.php
+1 -1
View File
@@ -36,7 +36,7 @@ $lang->release->product = $lang->productCommon;
$lang->release->branch = 'Platform/Branch';
$lang->release->build = 'Build';
$lang->release->name = 'Name';
$lang->release->marker = 'Marker';
$lang->release->marker = 'Milestone';
$lang->release->date = 'Date';
$lang->release->desc = 'Description';
$lang->release->status = 'Status';
module/story/lang/en.php
+1 -1
View File
@@ -36,7 +36,7 @@ $lang->story->caseCountAB = 'C';
$lang->story->linkStory = 'Link';
$lang->story->unlinkStory = 'UnLinked';
$lang->story->export = "Export Data";
$lang->story->zeroCase = "Story w/o cases";
$lang->story->zeroCase = "Stories w/o cases";
$lang->story->zeroTask = "Display stories w/o tasks";
$lang->story->reportChart = "Report";
$lang->story->copyTitle = "Copy Title";
module/task/js/create.js
+1 -16
View File
@@ -209,9 +209,6 @@ $(document).ready(function()
var adjustButtons = function()
{
$taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null);
$taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
$taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
var $deleteBtn = $taskTeamEditor.find('.btn-delete');
if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled');
};
@@ -233,19 +230,7 @@ $(document).ready(function()
$row.remove();
adjustButtons();
});
}).on('click', '.btn-move-up, .btn-move-down', function()
{
var $this = $(this);
if($this.hasClass('btn-move-up'))
{
$(this).parents('tr').prev().before($(this).parents('tr'));
}
else
{
$this.parents('tr').next().after($(this).parents('tr'));
}
adjustButtons();
});;
});
adjustButtons();
});
module/task/js/edit.js
+2 -17
View File
@@ -93,7 +93,7 @@ $(document).ready(function()
var $taskTeamEditor = $('#taskTeamEditor').batchActionForm(
{
idStart: 0,
idEnd: 5,
idEnd: newRowCount - 1,
chosen: true,
datetimepicker: false,
colorPicker: false,
@@ -102,9 +102,6 @@ $(document).ready(function()
var adjustButtons = function()
{
$taskTeamEditor.find('.btn-move-up.disabled,.btn-move-down.disabled,.btn-delete.disabled').removeClass('disabled').attr('disabled', null);
$taskTeamEditor.find('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
$taskTeamEditor.find('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
var $deleteBtn = $taskTeamEditor.find('.btn-delete');
if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled');
};
@@ -126,19 +123,7 @@ $(document).ready(function()
$row.remove();
adjustButtons();
});
}).on('click', '.btn-move-up, .btn-move-down', function()
{
var $this = $(this);
if($this.hasClass('btn-move-up'))
{
$(this).parents('tr').prev().before($(this).parents('tr'));
}
else
{
$this.parents('tr').next().after($(this).parents('tr'));
}
adjustButtons();
});;
});
adjustButtons();
});
module/task/lang/en.php
+1 -1
View File
@@ -117,7 +117,7 @@ $lang->task->noStory = 'No Story';
$lang->task->noAssigned = 'Unassigned';
$lang->task->noFinished = 'Unfinished';
$lang->task->noClosed = 'Unclosed';
$lang->task->yesterdayFinished = 'Finishied Yesterday';
$lang->task->yesterdayFinished = 'Finished Yesterday';
$lang->task->allTasks = 'All Tasks';
$lang->task->statusList[''] = '';
module/task/view/create.html.php
+6 -6
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php include '../../common/view/sortable.html.php';?>
<?php js::set('toTaskList', $config->global->flow == 'onlyTask' || !empty($task->id));?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
@@ -181,7 +182,7 @@
</div>
<div class='modal-content with-padding'>
<table class="table table-form" id='taskTeamEditor'>
<tbody>
<tbody class='sortable'>
<tr class='template'>
<td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
<td>
@@ -190,11 +191,10 @@
<span class='input-group-addon'><?php echo $lang->task->hour;?></span>
</div>
</td>
<td class='w-130px'>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
<button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
<button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
<td class='w-130px sort-handler'>
<button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
<button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
</td>
</tr>
</tbody>
module/task/view/edit.html.php
+13 -12
View File
@@ -13,11 +13,13 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::set('oldStoryID', $task->story); ?>
<?php js::set('oldAssignedTo', $task->assignedTo); ?>
<?php js::set('oldProjectID', $task->project); ?>
<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject); ?>
<?php js::set('changeProjectConfirmed', false); ?>
<?php include '../../common/view/sortable.html.php';?>
<?php js::set('oldStoryID', $task->story);?>
<?php js::set('oldAssignedTo', $task->assignedTo);?>
<?php js::set('oldProjectID', $task->project);?>
<?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
<?php js::set('changeProjectConfirmed', false);?>
<?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
<div class='main-content' id='mainContent'>
<form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
<div class='main-header'>
@@ -219,7 +221,7 @@
</div>
<div class="modal-content with-padding" id='taskTeamEditor'>
<table class='table table-form'>
<tbody>
<tbody class="sortable">
<?php foreach($task->team as $member):?>
<tr>
<td class='w-250px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
@@ -233,10 +235,10 @@
<?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
</div>
</td>
<td class='w-130px'>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
<td class='w-130px sort-handler'>
<button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
<button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
</td>
</tr>
<?php endforeach;?>
@@ -252,10 +254,9 @@
<?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
</div>
</td>
<td class='w-130px'>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-up'><i class='icon-arrow-up'></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move-down'><i class='icon-arrow-down'></i></button>
<td class='w-130px sort-handler'>
<button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
<button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
<button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
</td>
</tr>
module/testcase/lang/en.php
+3 -3
View File
@@ -116,7 +116,7 @@ $lang->testcase->assignToMe = 'AssignedToMe';
$lang->testcase->openedByMe = 'CreatedByMe';
$lang->testcase->allCases = 'All';
$lang->testcase->allTestcases = 'All Cases';
$lang->testcase->needConfirm = 'Story Change';
$lang->testcase->needConfirm = 'StoryChanged';
$lang->testcase->bySearch = 'Search';
$lang->testcase->unexecuted = 'Wait';
@@ -169,8 +169,8 @@ $lang->testcase->reviewResultList['pass'] = 'Pass';
$lang->testcase->reviewResultList['clarify'] = 'Clarify';
$lang->testcase->groups[''] = 'Group ';
$lang->testcase->groups['story'] = 'Story Group';
$lang->testcase->groups['assignedTo'] = 'Assign Group';
$lang->testcase->groups['story'] = 'Group by Story';
$lang->testcase->groups['assignedTo'] = 'Group by Assignee';
$lang->testcase->statusList[''] = '';
$lang->testcase->statusList['wait'] = 'Wait';
module/testtask/lang/en.php
+1 -1
View File
@@ -10,7 +10,7 @@
* @link http://www.zentao.net
*/
$lang->testtask->index = "Home";
$lang->testtask->create = "Create Test";
$lang->testtask->create = "Submit Test";
$lang->testtask->reportChart = 'Report';
$lang->testtask->delete = "Delete";
$lang->testtask->view = "Overview";
module/todo/lang/en.php
+1 -1
View File
@@ -89,7 +89,7 @@ if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory')
$lang->todo->confirmDelete = "Do you want to delete this Todo?";
$lang->todo->thisIsPrivate = 'This is a private Todo';
$lang->todo->lblDisableDate = 'Set later';
$lang->todo->lblDisableDate = 'Set it later';
$lang->todo->lblBeforeDays = "Create a todo %s days(s) earlier";
$lang->todo->lblClickCreate = "Click to add a todo";
$lang->todo->noTodo = 'No todos of this type.';
module/upgrade/model.php
+7 -1
View File
@@ -2247,7 +2247,13 @@ class upgradeModel extends model
$this->dao->insert(TABLE_HISTORY)->set('`new`')->eq($action->actor)->set('`field`')->eq('closedBy')->set('`action`')->eq($action->id)->exec();
$this->dao->insert(TABLE_HISTORY)->set('`new`')->eq($action->date)->set('`old`')->eq('0000-00-00 00:00:00')->set('`field`')->eq('closedDate')->set('`action`')->eq($action->id)->exec();
$this->dao->update(TABLE_HISTORY)->set('`new`')->eq('closed')->where('`action`')->eq($action->id)->andWhere('field')->eq('status')->exec();
$this->dao->update(TABLE_PROJECT)->set('`status`')->eq('closed')->set('`closedBy`')->eq($action->actor)->set('`closedDate`')->eq($action->date)->where('id')->eq($action->objectID)->exec();
$this->dao->update(TABLE_PROJECT)
->set('`status`')->eq('closed')
->set('`closedBy`')->eq($action->actor)
->set('`closedDate`')->eq($action->date)
->where('id')->eq($action->objectID)
->andWhere('status')->eq('done')
->exec();
}
return !dao::isError();
}