diff --git a/db/update16.1.sql b/db/update16.1.sql index 3c5a36ce4a..4d0a19bb0e 100644 --- a/db/update16.1.sql +++ b/db/update16.1.sql @@ -1,3 +1,4 @@ ALTER TABLE `zt_project` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`; ALTER TABLE `zt_product` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`; ALTER TABLE `zt_doclib` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `order`; +ALTER TABLE `zt_task` ADD `vision` varchar(10) NOT NULL DEFAULT 'common' AFTER `v2`; diff --git a/db/zentao.sql b/db/zentao.sql index 71d6b5a28f..157128fa12 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1370,6 +1370,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` ( `lines` varchar(10) NOT NULL, `v1` varchar(40) NOT NULL, `v2` varchar(40) NOT NULL, + `vision` varchar(10) NOT NULL DEFAULT 'common', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), KEY `execution` (`execution`), diff --git a/extension/lite/block/ext/view/main.lite.html.hook.php b/extension/lite/block/ext/view/main.lite.html.hook.php new file mode 100644 index 0000000000..9ac355ac44 --- /dev/null +++ b/extension/lite/block/ext/view/main.lite.html.hook.php @@ -0,0 +1,4 @@ + diff --git a/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php b/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php new file mode 100644 index 0000000000..d0992c9834 --- /dev/null +++ b/extension/lite/block/ext/view/printassigntomeblock.lite.html.hook.php @@ -0,0 +1,3 @@ + diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index 4cf3152d0a..c04eeb40bc 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -11,7 +11,7 @@ $lang->mainNav->menuOrder[65] = 'admin'; $lang->my->menu = new stdclass(); $lang->my->menu->index = array('link' => "$lang->dashboard|my|index"); $lang->my->menu->calendar = array('link' => "$lang->calendar|my|calendar|", 'subModule' => 'todo', 'alias' => 'todo'); -$lang->my->menu->task = array('link' => "{$lang->task->common}|my|task|", 'subModule' => 'task'); +$lang->my->menu->task = array('link' => "{$lang->task->common}|my|contribute|mode=task&type=assignedTo", 'subModule' => 'task'); /* My menu order. */ $lang->my->menuOrder = array(); diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php new file mode 100644 index 0000000000..b240a99e6d --- /dev/null +++ b/extension/lite/my/ext/view/task.html.php @@ -0,0 +1,319 @@ + + * @package dashboard + * @version $Id: task.html.php 5101 2013-07-12 00:44:27Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +?> +app->getModuleRoot() . '/common/view/header.html.php';?> + +recTotal);?> +rawMethod);?> + +
+ +
+

task->noTask;?>

+
+ +
+ + + + + + + + + + systemMode == 'new'):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + systemMode == 'new'):?> + + + + + + + + + + + + + + + + + + + + children)):?> + + children as $key => $child):?> + + children)) ? ' table-child-bottom' : '';?> + + + + + systemMode == 'new'):?> + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + idAB);?> +
priAB);?>task->name);?>my->projects);?>my->executions);?>openedByAB);?>task->deadlineAB);?>task->assignedTo);?>task->finishedBy);?>task->estimateAB);?>task->consumedAB);?>task->leftAB);?>statusAB);?>actions;?>
+ +
+ /> + +
+ + id);?> +
pri;?>' title='task->priList, $task->pri);?>'>task->priList, $task->pri);?>' title='name?>'> + team)) echo '' . $this->lang->task->multipleAB . ' ';?> + parent > 0) + { + echo '' . $this->lang->task->childrenAB . ' ' . html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->parentName . ' / '. $task->name, '', "title='{$task->parentName} / {$task->name}'"); + } + else + { + echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color'"); + } + ?> + children)) echo '';?> + createLink('project', 'index', "projectID=$task->project"), $task->projectName);?>createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?>openedBy);?>deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> task->printAssignedHtml($task, $users);?>finishedBy);?>estimate, 1) . $lang->execution->workHourUnit;?>consumed, 1) . $lang->execution->workHourUnit;?>left, 1) . $lang->execution->workHourUnit;?> + storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?> + {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?> + + needConfirm) + { + $this->lang->task->confirmStoryChange = $this->lang->confirm; + common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin', '', '', '', '', $task->project); + } + else + { + if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project); + if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project); + common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, '', '', $task->project); + + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project); + common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project); + common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=true", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project); + } + } + ?> +
+ +
+ /> + +
+ + id);?> +
pri;?>' title='task->priList, $child->pri);?>'>task->priList, $child->pri);?> + parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?> + createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?> + createLink('project', 'view', "projectID=$child->project"), $child->projectName);?>createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?>openedBy);?>deadline, 0, 4) > 0) echo substr($child->deadline, 5, 6);?> task->printAssignedHtml($child, $users);?>finishedBy);?>estimate, 1) . ' ' . $lang->execution->workHourUnit;?>consumed, 1) . ' ' . $lang->execution->workHourUnit;?>left, 1) . ' ' . $lang->execution->workHourUnit;?> + storyStatus) and $child->storyStatus == 'active' and $child->latestStoryVersion > $child->storyVersion and !in_array($child->status, array('cancel', 'closed')));?> + {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $child) . "");?> + + needConfirm) + { + $this->lang->task->confirmStoryChange = $this->lang->confirm; + common::printIcon('task', 'confirmStoryChange', "taskid=$child->id", '', 'list', '', 'hiddenwin', '', '', '', '', $child->project); + } + else + { + if($child->status != 'pause') common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project); + if($child->status == 'pause') common::printIcon('task', 'restart', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project); + common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project); + common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true, '', '', $child->project); + + common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->project); + common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list', '', '', '', '', '', '', $child->project); + common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=true", $child, 'list', 'split', '', 'iframe', true, '', $this->lang->task->children, $child->project); + } + } + ?> +
+ +
+ +
+ + +app->getModuleRoot() . '/common/view/footer.html.php';?> diff --git a/extension/lite/product/ext/view/browse.html.php b/extension/lite/product/ext/view/browse.html.php index 18bf508f1d..39dbc8ada6 100644 --- a/extension/lite/product/ext/view/browse.html.php +++ b/extension/lite/product/ext/view/browse.html.php @@ -10,14 +10,6 @@ * @link http://www.zentao.net */ ?> -name; -} -?> app->getModuleRoot() . '/common/view/header.html.php';?> app->getModuleRoot() . '/common/view/datatable.fix.html.php';?>