* finish task #960.
This commit is contained in:
@@ -490,7 +490,7 @@ class bug extends control
|
|||||||
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
||||||
|
|
||||||
/* Assign. */
|
/* Assign. */
|
||||||
$this->view->header['title'] = $product->name . $this->lang->colon . $this->lang->bug->batchEdit;
|
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->bug->batchEdit;
|
||||||
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->bug->common;
|
$this->view->position[] = $this->lang->bug->common;
|
||||||
$this->view->position[] = $this->lang->bug->batchEdit;
|
$this->view->position[] = $this->lang->bug->batchEdit;
|
||||||
@@ -588,7 +588,7 @@ class bug extends control
|
|||||||
$productID = $bug->product;
|
$productID = $bug->product;
|
||||||
$this->bug->setMenu($this->products, $productID);
|
$this->bug->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->bug->confirmBug;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->confirmBug;
|
||||||
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->bug->confirmBug;
|
$this->view->position[] = $this->lang->bug->confirmBug;
|
||||||
|
|
||||||
@@ -629,7 +629,7 @@ class bug extends control
|
|||||||
$productID = $bug->product;
|
$productID = $bug->product;
|
||||||
$this->bug->setMenu($this->products, $productID);
|
$this->bug->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
|
||||||
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->bug->resolve;
|
$this->view->position[] = $this->lang->bug->resolve;
|
||||||
|
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ class project extends control
|
|||||||
$this->app->session->set('storyList', $this->app->getURI(true));
|
$this->app->session->set('storyList', $this->app->getURI(true));
|
||||||
|
|
||||||
/* Header and session. */
|
/* Header and session. */
|
||||||
$this->view->header['title'] = $project->name . $this->lang->colon . $this->lang->project->task;
|
$this->view->header->title = $project->name . $this->lang->colon . $this->lang->project->task;
|
||||||
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
|
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
|
||||||
$this->view->position[] = $this->lang->project->task;
|
$this->view->position[] = $this->lang->project->task;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
$(document).ready(function()
|
$(document).ready(function()
|
||||||
{
|
{
|
||||||
$("a.iframe").colorbox({width:640, height:480, iframe:true, transition:'none'});
|
$("a.iframe").colorbox({width:640, height:480, iframe:true, transition:'none'});
|
||||||
|
$("a.batchWBS").colorbox({width:1024, height:580, iframe:true, transition:'none'});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ $lang->project->taskSummary = "Total tasks shown: <strong>%s</strong>. Pendi
|
|||||||
$lang->project->memberHours = "%s has <strong>%s</strong> workhours, ";
|
$lang->project->memberHours = "%s has <strong>%s</strong> workhours, ";
|
||||||
$lang->project->groupSummary = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
|
$lang->project->groupSummary = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
|
||||||
$lang->project->wbs = "WBS";
|
$lang->project->wbs = "WBS";
|
||||||
|
$lang->project->batchWBS = "Batch WBS";
|
||||||
$lang->project->largeBurnChart = 'View large';
|
$lang->project->largeBurnChart = 'View large';
|
||||||
$lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>How?</i></a>";
|
$lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>How?</i></a>";
|
||||||
$lang->project->whyNoStories = "There no active stories to added to this project. Please check the linked product.";
|
$lang->project->whyNoStories = "There no active stories to added to this project. Please check the linked product.";
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ $lang->project->taskSummary = "本页共 <strong>%s</strong> 个任务,未
|
|||||||
$lang->project->memberHours = "%s共有 <strong>%s</strong> 个可用工时,";
|
$lang->project->memberHours = "%s共有 <strong>%s</strong> 个可用工时,";
|
||||||
$lang->project->groupSummary = "本组共 <strong>%s</strong> 个任务,未开始<strong>%s</strong>,进行中<strong>%s</strong>,总预计<strong>%s</strong>工时,已消耗<strong>%s</strong>工时,剩余<strong>%s</strong>工时。";
|
$lang->project->groupSummary = "本组共 <strong>%s</strong> 个任务,未开始<strong>%s</strong>,进行中<strong>%s</strong>,总预计<strong>%s</strong>工时,已消耗<strong>%s</strong>工时,剩余<strong>%s</strong>工时。";
|
||||||
$lang->project->wbs = "分解任务";
|
$lang->project->wbs = "分解任务";
|
||||||
|
$lang->project->batchWBS = "批量分解";
|
||||||
$lang->project->largeBurnChart = '点击查看大图';
|
$lang->project->largeBurnChart = '点击查看大图';
|
||||||
$lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>如何更新?</i></a>";
|
$lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>如何更新?</i></a>";
|
||||||
$lang->project->whyNoStories = "看起来没有需求可以关联。请检查下项目关联的产品中有没有需求,而且要确保它们已经审核通过。";
|
$lang->project->whyNoStories = "看起来没有需求可以关联。请检查下项目关联的产品中有没有需求,而且要确保它们已经审核通过。";
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
<th class='w-hour {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
<th class='w-hour {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
|
||||||
<th class='w-status {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
|
<th class='w-status {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
|
||||||
<th class='w-50px'> <?php echo $lang->story->taskCount;?></th>
|
<th class='w-50px'> <?php echo $lang->story->taskCount;?></th>
|
||||||
<th class='w-100px {sorter:false}'> <?php echo $lang->actions;?></th>
|
<th class='w-150px {sorter:false}'> <?php echo $lang->actions;?></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
<?php
|
<?php
|
||||||
$param = "projectID={$project->id}&story={$story->id}";
|
$param = "projectID={$project->id}&story={$story->id}";
|
||||||
common::printLink('task', 'create', $param, $lang->project->wbs);
|
common::printLink('task', 'create', $param, $lang->project->wbs);
|
||||||
common::printLink('task', 'batchCreate', $param, $lang->task->batchCreate);
|
common::printLink('task', 'batchCreate', $param . "&iframe=1", $lang->project->batchWBS, '', "class='batchWBS'", true, true);
|
||||||
common::printLink('project', 'unlinkStory', $param, $lang->unlink, 'hiddenwin');
|
common::printLink('project', 'unlinkStory', $param, $lang->unlink, 'hiddenwin');
|
||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -325,12 +325,12 @@ class story extends control
|
|||||||
if(!$projectID)
|
if(!$projectID)
|
||||||
{
|
{
|
||||||
$product = $this->product->getByID($productID);
|
$product = $this->product->getByID($productID);
|
||||||
$this->view->header['title'] = $product->name . $this->lang->colon . $this->lang->story->batchEdit;
|
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->story->batchEdit;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$project = $this->project->getByID($projectID);
|
$project = $this->project->getByID($projectID);
|
||||||
$this->view->header['title'] = $project->name . $this->lang->colon . $this->lang->story->batchEdit;
|
$this->view->header->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit;
|
||||||
}
|
}
|
||||||
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
|
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
|
||||||
$this->view->position[] = $this->lang->story->common;
|
$this->view->position[] = $this->lang->story->common;
|
||||||
@@ -646,12 +646,12 @@ class story extends control
|
|||||||
if(!$projectID)
|
if(!$projectID)
|
||||||
{
|
{
|
||||||
$product = $this->product->getByID($productID);
|
$product = $this->product->getByID($productID);
|
||||||
$this->view->header['title'] = $product->name . $this->lang->colon . $this->lang->story->batchClose;
|
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->story->batchClose;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$project = $this->project->getByID($projectID);
|
$project = $this->project->getByID($projectID);
|
||||||
$this->view->header['title'] = $project->name . $this->lang->colon . $this->lang->story->batchClose;
|
$this->view->header->title = $project->name . $this->lang->colon . $this->lang->story->batchClose;
|
||||||
}
|
}
|
||||||
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
|
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
|
||||||
$this->view->position[] = $this->lang->story->common;
|
$this->view->position[] = $this->lang->story->common;
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ class task extends control
|
|||||||
* @access public
|
* @access public
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function batchCreate($projectID = 0, $storyID = 0)
|
public function batchCreate($projectID = 0, $storyID = 0, $iframe = 0)
|
||||||
{
|
{
|
||||||
$project = $this->project->getById($projectID);
|
$project = $this->project->getById($projectID);
|
||||||
$taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
|
$taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
|
||||||
@@ -118,6 +118,7 @@ class task extends control
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Locate the browser. */
|
/* Locate the browser. */
|
||||||
|
if($iframe) die(js::reload('parent.parent'));
|
||||||
die(js::locate($taskLink, 'parent'));
|
die(js::locate($taskLink, 'parent'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,9 +255,9 @@ class task extends control
|
|||||||
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
||||||
|
|
||||||
/* Assign. */
|
/* Assign. */
|
||||||
$this->view->header['title'] = $project->name . $this->lang->colon . $this->lang->task->batchEdit;
|
$this->view->header->title = $project->name . $this->lang->colon . $this->lang->task->batchEdit;
|
||||||
$this->view->position[] = $this->lang->task->common;
|
$this->view->position[] = $this->lang->task->common;
|
||||||
$this->view->position[] = $this->lang->task->batchEdit;
|
$this->view->position[] = $this->lang->task->batchEdit;
|
||||||
|
|
||||||
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
|
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
|
||||||
$members = $members + array('closed' => 'Closed');
|
$members = $members + array('closed' => 'Closed');
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ class testcase extends control
|
|||||||
$productID = $case->product;
|
$productID = $case->product;
|
||||||
$this->testcase->setMenu($this->products, $productID);
|
$this->testcase->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = "CASE #$case->id $case->title - " . $this->products[$productID];
|
$this->view->header->title = "CASE #$case->id $case->title - " . $this->products[$productID];
|
||||||
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testcase->view;
|
$this->view->position[] = $this->lang->testcase->view;
|
||||||
|
|
||||||
@@ -435,7 +435,7 @@ class testcase extends control
|
|||||||
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
|
||||||
|
|
||||||
/* Assign. */
|
/* Assign. */
|
||||||
$this->view->header['title'] = $product->name . $this->lang->colon . $this->lang->testcase->batchEdit;
|
$this->view->header->title = $product->name . $this->lang->colon . $this->lang->testcase->batchEdit;
|
||||||
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testcase->common;
|
$this->view->position[] = $this->lang->testcase->common;
|
||||||
$this->view->position[] = $this->lang->testcase->batchEdit;
|
$this->view->position[] = $this->lang->testcase->batchEdit;
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ class testtask extends control
|
|||||||
$productID = $this->product->saveState($productID, $this->products);
|
$productID = $this->product->saveState($productID, $this->products);
|
||||||
$this->testtask->setMenu($this->products, $productID);
|
$this->testtask->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->create;
|
||||||
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testtask->create;
|
$this->view->position[] = $this->lang->testtask->create;
|
||||||
|
|
||||||
@@ -178,7 +178,7 @@ class testtask extends control
|
|||||||
$productID = $task->product;
|
$productID = $task->product;
|
||||||
$this->testtask->setMenu($this->products, $productID);
|
$this->testtask->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = "TASK #$task->id $task->name/" . $this->products[$productID];
|
$this->view->header->title = "TASK #$task->id $task->name/" . $this->products[$productID];
|
||||||
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testtask->view;
|
$this->view->position[] = $this->lang->testtask->view;
|
||||||
|
|
||||||
@@ -236,7 +236,7 @@ class testtask extends control
|
|||||||
foreach($this->view->runs as $run) $testcaseIDs .= ',' . $run->case;
|
foreach($this->view->runs as $run) $testcaseIDs .= ',' . $run->case;
|
||||||
$this->session->set('testcaseIDs', $testcaseIDs . ',');
|
$this->session->set('testcaseIDs', $testcaseIDs . ',');
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases;
|
||||||
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testtask->cases;
|
$this->view->position[] = $this->lang->testtask->cases;
|
||||||
$this->view->productID = $productID;
|
$this->view->productID = $productID;
|
||||||
@@ -286,7 +286,7 @@ class testtask extends control
|
|||||||
/* Set menu. */
|
/* Set menu. */
|
||||||
$this->testtask->setMenu($this->products, $productID);
|
$this->testtask->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
|
||||||
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testtask->edit;
|
$this->view->position[] = $this->lang->testtask->edit;
|
||||||
|
|
||||||
@@ -355,7 +355,7 @@ class testtask extends control
|
|||||||
/* Save session. */
|
/* Save session. */
|
||||||
$this->testtask->setMenu($this->products, $productID);
|
$this->testtask->setMenu($this->products, $productID);
|
||||||
|
|
||||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->linkCase;
|
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->linkCase;
|
||||||
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||||
$this->view->position[] = $this->lang->testtask->linkCase;
|
$this->view->position[] = $this->lang->testtask->linkCase;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user