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

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

Browse Source
This commit is contained in:
wangyidong
2016-02-15 17:29:46 +08:00
parent e8bb9aa1ee 5266c8c064
commit d324bb72e6
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/browse.html.php
-1
View File
@@ -73,7 +73,6 @@ js::set('moduleID', $moduleID);
<?php echo $moduleTree;?>
<div class='text-right'>
<?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?>
<?php common::printLink('tree', 'fix', "root=$productID&type=bug", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</div>
module/doc/view/browse.html.php
-1
View File
@@ -36,7 +36,6 @@ var browseType = '<?php echo $browseType;?>';
<?php echo $moduleTree;?>
<div class='text-right'>
<?php common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType);?>
<?php if(is_numeric($libID)) common::printLink('tree', 'fix', "root=$libID&type=customdoc", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</div>
module/product/view/browse.html.php
-1
View File
@@ -63,7 +63,6 @@
<?php echo $moduleTree;?>
<div class='text-right'>
<?php common::printLink('tree', 'browse', "rootID=$productID&view=story", $lang->tree->manage);?>
<?php common::printLink('tree', 'fix', "root=$productID&type=story", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</div>
module/productplan/view/browse.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<?php if($this->session->currentProductType != 'normal'):?>
<th class='w-100px'> <?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
<?php endif;?>
<th class='w-p50'> <?php common::printOrderLink('desc', $orderBy, $vars, $lang->productplan->desc);?></th>
<th class='w-p50'> <?php echo $lang->productplan->desc;?></th>
<th class='w-100px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
<th class='w-100px'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->productplan->end);?></th>
<th class="w-110px {sorter: false}"><?php echo $lang->actions;?></th>
module/productplan/view/view.html.php
+1
View File
@@ -28,6 +28,7 @@
{
ob_start();
echo "<div class='btn-group'>";
common::printIcon('story', 'create', "productID=$plan->product&branch=$plan->branch&moduleID=0&storyID=0&projectID=0&bugID=0&planID=$plan->id", '', 'button', 'plus');
if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn'");
if(common::hasPriv('productplan', 'linkBug')) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn'");
echo '</div>';
module/project/view/task.html.php
-1
View File
@@ -31,7 +31,6 @@
<?php common::printLink('project', 'edit', "projectID=$projectID", $lang->edit);?>
<?php common::printLink('project', 'delete', "projectID=$projectID&confirm=no", $lang->delete, 'hiddenwin');?>
<?php common::printLink('tree', 'browsetask', "rootID=$projectID&productID=0", $lang->tree->manage);?>
<?php common::printLink('tree', 'fix', "root=$projectID&type=task", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</div>
module/story/control.php
+6 -2
View File
@@ -31,11 +31,16 @@ class story extends control
* Create a story.
*
* @param int $productID
* @param int $branch
* @param int $moduleID
* @param int $storyID
* @param int $projectID
* @param int $bugID
* @param int $planID
* @access public
* @return void
*/
public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0)
public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0)
{
if(!empty($_POST))
{
@@ -112,7 +117,6 @@ class story extends control
$this->product->setMenu($products, $product->id, $branch);
/* Init vars. */
$planID = 0;
$source = '';
$pri = 0;
$estimate = '';
module/testcase/view/browse.html.php
-1
View File
@@ -29,7 +29,6 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete);
<?php echo $moduleTree;?>
<div class='text-right'>
<?php common::printLink('tree', 'browse', "productID=$productID&view=case", $lang->tree->manage);?>
<?php common::printLink('tree', 'fix', "root=$productID&type=case", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</div>