* Add issue module notes.
This commit is contained in:
@@ -81,7 +81,7 @@ class issue extends control
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
*/
|
||||
public function batchCreate()
|
||||
{
|
||||
if($_POST)
|
||||
@@ -314,6 +314,13 @@ class issue extends control
|
||||
$this->display();
|
||||
}
|
||||
|
||||
/**
|
||||
* prepairParams
|
||||
*
|
||||
* @param int $issue
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function prepairParams($issue)
|
||||
{
|
||||
$this->loadModel('task');
|
||||
@@ -396,10 +403,11 @@ class issue extends control
|
||||
$this->display();
|
||||
}
|
||||
|
||||
/**
|
||||
* Common actions of issue module.
|
||||
/**
|
||||
* commonAction
|
||||
*
|
||||
* @param int $issueID
|
||||
* @param int $object
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
|
||||
@@ -1,4 +1,14 @@
|
||||
<?php
|
||||
/**
|
||||
* The issue module English file of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id: en.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
$lang->issue->common = 'Issue';
|
||||
$lang->issue->browse = 'List';
|
||||
$lang->issue->resolvedBy = 'Resolved By';
|
||||
|
||||
@@ -1,4 +1,14 @@
|
||||
<?php
|
||||
/**
|
||||
* The issue module zh-cn file of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id: zh-cn.php 4729 2013-05-03 07:53:55Z chencongzhi520@gmail.com $
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
$lang->issue->common = '项目问题';
|
||||
$lang->issue->browse = '问题列表';
|
||||
$lang->issue->resolvedBy = '解决者';
|
||||
|
||||
+18
-4
@@ -62,7 +62,6 @@ class issueModel extends model
|
||||
* @param string $owner
|
||||
* @param string $activityID
|
||||
* @param object $pager
|
||||
*
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
@@ -94,7 +93,7 @@ class issueModel extends model
|
||||
$issueQuery = '';
|
||||
if($browseType == 'bysearch')
|
||||
{
|
||||
$query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
|
||||
$query = $queryID ? $this->loadModel('search')->getQuery($queryID) : '';
|
||||
if($query)
|
||||
{
|
||||
$this->session->set('issueQuery', $query->sql);
|
||||
@@ -120,11 +119,26 @@ class issueModel extends model
|
||||
return $issueList;
|
||||
}
|
||||
|
||||
/**
|
||||
* getActivityList
|
||||
*
|
||||
* @access public
|
||||
* @return object
|
||||
*/
|
||||
public function getActivityList()
|
||||
{
|
||||
return $this->dao->select('id,name')->from(TABLE_ACTIVITY)->where('deleted')->eq('0')->orderBy('id_desc')->fetchPairs();
|
||||
}
|
||||
|
||||
/**
|
||||
* getBlockIssues
|
||||
*
|
||||
* @param string $browseType
|
||||
* @param int $limit
|
||||
* @param string $orderBy
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getBlockIssues($browseType = 'all', $limit = 15, $orderBy = 'id_desc')
|
||||
{
|
||||
$issueList = $this->dao->select('*')->from(TABLE_ISSUE)
|
||||
@@ -325,7 +339,7 @@ class issueModel extends model
|
||||
*
|
||||
* @param int $issueID
|
||||
* @access public
|
||||
* @return void
|
||||
* @return object
|
||||
*/
|
||||
public function resolve($issueID)
|
||||
{
|
||||
@@ -338,7 +352,7 @@ class issueModel extends model
|
||||
* Create task.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
* @return object
|
||||
*/
|
||||
public function createTask()
|
||||
{
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
<?php
|
||||
/**
|
||||
* The createbug view of issue module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Congzhi Chen <congzhi@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<tr class='bugTR storyTR'>
|
||||
<th class='w-110px'><?php echo $lang->bug->product;?></th>
|
||||
<td>
|
||||
@@ -262,14 +274,14 @@ $(function()
|
||||
|
||||
/**
|
||||
* Load all fields.
|
||||
*
|
||||
* @param int $productID
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function loadAll(productID)
|
||||
{
|
||||
if(page == 'create')
|
||||
if(page == 'create')
|
||||
{
|
||||
loadProjectTeamMembers(productID);
|
||||
}
|
||||
@@ -294,8 +306,8 @@ function loadAll(productID)
|
||||
$('#taskIdBox').innerHTML = '<select id="task"></select>'; // Reset the task.
|
||||
$('#task').chosen();
|
||||
loadProductBranches(productID)
|
||||
loadProductModules(productID);
|
||||
loadProductProjects(productID);
|
||||
loadProductModules(productID);
|
||||
loadProductProjects(productID);
|
||||
loadProductBuilds(productID);
|
||||
loadProductplans(productID);
|
||||
loadProductStories(productID);
|
||||
@@ -304,7 +316,7 @@ function loadAll(productID)
|
||||
|
||||
/**
|
||||
* Load by branch.
|
||||
*
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -314,7 +326,7 @@ function loadBranch()
|
||||
$('#task').chosen();
|
||||
productID = $('#product').val();
|
||||
loadProductModules(productID);
|
||||
loadProductProjects(productID);
|
||||
loadProductProjects(productID);
|
||||
loadProductBuilds(productID);
|
||||
loadProductplans(productID);
|
||||
loadProductStories(productID);
|
||||
@@ -351,7 +363,7 @@ function loadAllBuilds(that)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Load all builds of the project.
|
||||
*
|
||||
* @param int $projectID
|
||||
@@ -391,7 +403,7 @@ function loadAllProjectBuilds(projectID, productID)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Load all builds of the product.
|
||||
*
|
||||
* @param int $productID
|
||||
@@ -402,7 +414,7 @@ function loadAllProductBuilds(productID)
|
||||
{
|
||||
branch = $('#branch').val();
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
if(page == 'create')
|
||||
if(page == 'create')
|
||||
{
|
||||
link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&type=all');
|
||||
$.get(link, function(data)
|
||||
@@ -431,8 +443,8 @@ function loadAllProductBuilds(productID)
|
||||
|
||||
/**
|
||||
* Load product's modules.
|
||||
*
|
||||
* @param int $productID
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -442,16 +454,16 @@ function loadProductModules(productID)
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
|
||||
$('#moduleIdBox').load(link, function()
|
||||
{
|
||||
{
|
||||
$(this).find('select').chosen()
|
||||
if(typeof(bugModule) == 'string') $('#moduleIdBox').prepend("<span class='input-group-addon' style='border-left-width: 1px;'>" + bugModule + "</span>");
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Load product stories
|
||||
*
|
||||
* @param int $productID
|
||||
* Load product stories
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -464,9 +476,9 @@ function loadProductStories(productID)
|
||||
}
|
||||
|
||||
/**
|
||||
* Load projects of product.
|
||||
*
|
||||
* @param int $productID
|
||||
* Load projects of product.
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -480,8 +492,8 @@ function loadProductProjects(productID)
|
||||
|
||||
/**
|
||||
* Load product plans.
|
||||
*
|
||||
* @param productID $productID
|
||||
*
|
||||
* @param productID $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -494,9 +506,9 @@ function loadProductplans(productID)
|
||||
}
|
||||
|
||||
/**
|
||||
* Load product builds.
|
||||
*
|
||||
* @param productID $productID
|
||||
* Load product builds.
|
||||
*
|
||||
* @param productID $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -527,8 +539,8 @@ function loadProductBuilds(productID)
|
||||
|
||||
/**
|
||||
* Load project related bugs and tasks.
|
||||
*
|
||||
* @param int $projectID
|
||||
*
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -551,8 +563,8 @@ function loadProjectRelated(projectID)
|
||||
|
||||
/**
|
||||
* Load project tasks.
|
||||
*
|
||||
* @param projectID $projectID
|
||||
*
|
||||
* @param projectID $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -570,8 +582,8 @@ function loadProjectTasks(projectID)
|
||||
|
||||
/**
|
||||
* Load project stories.
|
||||
*
|
||||
* @param projectID $projectID
|
||||
*
|
||||
* @param projectID $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -585,8 +597,8 @@ function loadProjectStories(projectID)
|
||||
|
||||
/**
|
||||
* Load builds of a project.
|
||||
*
|
||||
* @param int $projectID
|
||||
*
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -613,7 +625,7 @@ function loadProjectBuilds(projectID)
|
||||
{
|
||||
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
|
||||
$('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
|
||||
|
||||
|
||||
oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
|
||||
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
|
||||
$('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
|
||||
@@ -622,9 +634,9 @@ function loadProjectBuilds(projectID)
|
||||
|
||||
/**
|
||||
* Set story field.
|
||||
*
|
||||
* @param moduleID $moduleID
|
||||
* @param productID $productID
|
||||
*
|
||||
* @param moduleID $moduleID
|
||||
* @param productID $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -644,8 +656,8 @@ function setStories(moduleID, productID)
|
||||
|
||||
/**
|
||||
* Load product branches.
|
||||
*
|
||||
* @param int $productID
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -666,8 +678,8 @@ function loadProductBranches(productID)
|
||||
|
||||
/**
|
||||
* Load team members of the project as assignedTo list.
|
||||
*
|
||||
* @param int $projectID
|
||||
*
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
@@ -684,21 +696,21 @@ function loadAssignedTo(projectID)
|
||||
|
||||
/**
|
||||
* notice for create build.
|
||||
*
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function notice()
|
||||
{
|
||||
$('#buildBoxActions').empty().hide();
|
||||
if($('#openedBuild').find('option').length <= 1)
|
||||
if($('#openedBuild').find('option').length <= 1)
|
||||
{
|
||||
var html = '';
|
||||
if($('#project').length == 0 || $('#project').val() == '')
|
||||
{
|
||||
var branch = $('#branch').val();
|
||||
if(typeof(branch) == 'undefined') branch = 0;
|
||||
var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch);
|
||||
var link = createLink('release', 'create', 'productID=' + $('#product').val() + '&branch=' + branch);
|
||||
if(typeof(flow) != 'undefined' && flow == 'onlyTest') link = createLink('build', 'create','projectID=' + $('#product').val());
|
||||
html += '<a href="' + link + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
|
||||
html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
<?php
|
||||
/**
|
||||
* The createrisk view of issue module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Congzhi Chen <congzhi@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<tr class="riskTR">
|
||||
<th><?php echo $lang->risk->name;?></th>
|
||||
<td>
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
<?php
|
||||
/**
|
||||
* The createstory view of issue module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Congzhi Chen <congzhi@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<tr class='storyTR'>
|
||||
<th><?php echo $lang->story->reviewedBy;?></th>
|
||||
<td><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'");?></td>
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
<?php
|
||||
/**
|
||||
* The createtask view of issue module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Congzhi Chen <congzhi@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<tr class='taskTR'>
|
||||
<th><?php echo $lang->task->project;?></th>
|
||||
<td><?php echo html::select('project', $projects, $project->id, "class='form-control chosen' onchange='loadAll(this.value)'");?></td><td></td><td></td>
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
<?php
|
||||
/**
|
||||
* The resolve view of issue module of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Congzhi Chen <congzhi@cnezsoft.com>
|
||||
* @package issue
|
||||
* @version $Id$
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
?>
|
||||
<?php
|
||||
include '../../common/view/header.html.php';
|
||||
include '../../common/view/kindeditor.html.php';
|
||||
|
||||
Reference in New Issue
Block a user