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

* finish task #2531.

Browse Source
This commit is contained in:
chenfeiCF
2016-04-08 00:00:24 +08:00
parent 10d9fe4982
commit 4ae9e43e41
24 changed files with 333 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+12 -10
View File
@@ -338,9 +338,11 @@ class task extends control
$this->project->setMenu($this->project->getPairs(), $project->id);
/* Set modules and members. */
$modules = array(0 => '/', 'ditto' => $this->lang->task->ditto) + $this->tree->getTaskOptionMenu($projectID);
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted') + array('closed' => 'Closed');
$members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members;
$modules = $this->tree->getTaskOptionMenu($projectID);
$modules['ditto'] = $this->lang->task->ditto;
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
$members['closed'] = 'Closed';
$members['ditto'] = $this->lang->task->ditto;
$this->view->title = $project->name . $this->lang->colon . $this->lang->task->batchEdit;
$this->view->position[] = html::a($this->createLink('project', 'browse', "project=$project->id"), $project->name);
@@ -369,18 +371,18 @@ class task extends control
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
/* Set pri, status and type list. */
$priList = array(0 => '', 'ditto' => $this->lang->task->ditto) + (array)$this->lang->task->priList;
$statusList = array('' => '', 'ditto' => $this->lang->task->ditto) + $this->lang->task->statusList;
$typeList = array('' => '', 'ditto' => $this->lang->task->ditto) + $this->lang->task->typeList;
/* Set ditto option for pri, status and type list. */
$this->lang->task->priList['ditto'] = $this->lang->task->ditto;
$this->lang->task->statusList['ditto'] = $this->lang->task->ditto;
$this->lang->task->typeList['ditto'] = $this->lang->task->ditto;
/* Assign. */
$this->view->position[] = $this->lang->task->common;
$this->view->position[] = $this->lang->task->batchEdit;
$this->view->projectID = $projectID;
$this->view->priList = $priList;
$this->view->statusList = $statusList;
$this->view->typeList = $typeList;
$this->view->priList = (array)$this->lang->task->priList;
$this->view->statusList = $this->lang->task->statusList;
$this->view->typeList = $this->lang->task->typeList;
$this->view->taskIDList = $taskIDList;
$this->view->tasks = $tasks;
$this->view->projectName = isset($project) ? $project->name : '';
module/task/js/batchedit.js
+11 -1
View File
@@ -1,3 +1,13 @@
$(function()
{
$firstTr = $('.table-form').find('tbody tr:first');
$firstTr.find('td select').each(function()
{
$(this).find("option[value='ditto']").remove();
$(this).trigger("chosen:updated");
});
})
$(document).on('click', '.chosen-with-drop', function()
{
var $select = $(this).prev('select');
@@ -26,7 +36,7 @@ $(document).on('change', 'select', function()
}
else
{
alert(editNotice);
alert(dittoNotice);
$(this).val(oldValue);
}
module/task/lang/en.php
+1 -1
View File
@@ -31,7 +31,6 @@ $lang->task->export = "Export data";
$lang->task->reportChart = "Report chart";
$lang->task->fromBug = 'From Bug';
$lang->task->confirmStoryChange = "Confirm story change";
$lang->task->editNotice = "Current task and task above it do not belong to same project!";
$lang->task->common = 'Task';
$lang->task->id = 'ID';
@@ -88,6 +87,7 @@ $lang->task->editEstimate = 'Edit Hour';
$lang->task->deleteEstimate = 'Delete Hour';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "Current task and task above it do not belong to same project!";
$lang->task->selectAllUser = 'All';
$lang->task->statusList[''] = '';
module/task/lang/zh-cn.php
+1 -1
View File
@@ -31,7 +31,6 @@ $lang->task->export = "导出数据";
$lang->task->reportChart = "报表统计";
$lang->task->fromBug = '来源Bug';
$lang->task->confirmStoryChange = "确认需求变动";
$lang->task->editNotice = "该任务与上一任务不属于同一项目！";
$lang->task->common = '任务';
$lang->task->id = '编号';
@@ -88,6 +87,7 @@ $lang->task->editEstimate = '编辑工时';
$lang->task->deleteEstimate = '删除工时';
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "该任务与上一任务不属于同一项目！";
$lang->task->selectAllUser = '全部';
$lang->task->statusList[''] = '';
module/task/view/batchedit.html.php
+6 -4
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php js::set('editNotice', $this->lang->task->editNotice);?>
<?php js::set('dittoNotice', $this->lang->task->dittoNotice);?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
@@ -42,11 +42,13 @@
<?php
if(!isset($project))
{
$modules = $this->tree->getOptionMenu($tasks[$taskID]->project, $viewType = 'task');
$prjInfo = $this->project->getById($tasks[$taskID]->project);
$modules = $this->tree->getOptionMenu($tasks[$taskID]->project, $viewType = 'task');
foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $prjInfo->name. $moduleName;
$modules = array(0 => '/', 'ditto' => $this->lang->task->ditto) + $modules;
$members = array('' => '', 'ditto' => $this->lang->task->ditto) + $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted');
$modules['ditto'] = $this->lang->task->ditto;
$members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted');
$members['ditto'] = $this->lang->task->ditto;
}
?>
<tr class='text-center'>