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

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

Browse Source
This commit is contained in:
Yagami
2020-08-28 11:38:51 +08:00
parent 283acfe49f 51fb61bed3
commit fe63c96aee
12 changed files with 52 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/scrumproductblock.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php if(empty($products)): ?>
<div class='empty-tip'><?php common::printLink('product', 'create', '', "<i class='icon-plus'></i> " . $lang->product->create, '', "class='btn btn-primary'")?></div>
<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
<?php else:?>
<div class="panel-body has-table scrollbar-hover">
<table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-projects tablesorter'>
module/block/view/scrumprojectblock.html.php
+2 -1
View File
@@ -20,7 +20,8 @@
<div class="col-4 text-middle text-center">
<div class="tile">
<div class="tile-title"><?php echo $lang->block->allProject;?></div>
<div class="tile-amount"><?php echo $summary->total;?></div>
<?php $projectLink = $this->createLink('project', 'index', 'locate=no')?>
<div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
</div>
</div>
<div class="col-8 text-middle">
module/budget/control.php
-8
View File
@@ -11,14 +11,6 @@
*/
class budget extends control
{
/**
* __construct
*
* @param string $module
* @param string $method
* @access public
* @return void
*/
public function __construct($module = '', $method = '')
{
parent::__construct($module, $method);
module/design/model.php
+1 -1
View File
@@ -255,7 +255,7 @@ class designModel extends model
}
/**
* Get list.
* Get design list.
*
* @param int $productID
* @param string $type
module/programplan/control.php
+6 -14
View File
@@ -11,14 +11,6 @@
*/
class programplan extends control
{
/**
* __construct
*
* @param string $moduleName
* @param string $methodName
* @access public
* @return void
*/
public function __construct($moduleName = '', $methodName = '')
{
parent::__construct($moduleName, $methodName);
@@ -26,7 +18,7 @@ class programplan extends control
}
/**
* Common action
* Common action.
*
* @param int $programID
* @param int $productID
@@ -44,7 +36,7 @@ class programplan extends control
}
/**
* Browse programplans
* Browse programplans.
*
* @param int $programID
* @param int $productID
@@ -98,7 +90,7 @@ class programplan extends control
}
/**
* Create a programplan
* Create a programplan.
*
* @param int $programID
* @param int $productID
@@ -140,7 +132,7 @@ class programplan extends control
}
/**
* Edit a programplan
* Edit a programplan.
*
* @param int $planID
* @access public
@@ -176,7 +168,7 @@ class programplan extends control
}
/**
* Delete a programplan
* Delete a programplan.
*
* @param int $planID
* @param string $confirm
@@ -204,7 +196,7 @@ class programplan extends control
}
/**
* Ajax custom
* Ajax custom.
*
* @access public
* @return void
module/programplan/model.php
+22 -22
View File
@@ -14,7 +14,7 @@
class programplanModel extends model
{
/**
* Set menu
* Set menu.
*
* @param int $programID
* @param int $productID
@@ -27,7 +27,7 @@ class programplanModel extends model
}
/**
* Get by id
* Get plan by id.
*
* @param int $planID
* @access public
@@ -41,7 +41,7 @@ class programplanModel extends model
}
/**
* Get projects by product
* Get projects by productID.
*
* @param int $productID
* @access public
@@ -55,7 +55,7 @@ class programplanModel extends model
}
/**
* Get list
* Get plans list.
*
* @param int $programID
* @param int $productID
@@ -82,7 +82,7 @@ class programplanModel extends model
}
/**
* Get by list
* Get plans by idList.
*
* @param array $idList
* @access public
@@ -99,7 +99,7 @@ class programplanModel extends model
}
/**
* Get plan pairs for budget
* Get plan pairs for budget.
*
* @param int $programID
* @access public
@@ -127,7 +127,7 @@ class programplanModel extends model
}
/**
* Get plans
* Get plans.
*
* @param int $programID
* @param int $productID
@@ -151,7 +151,7 @@ class programplanModel extends model
}
/**
* Get pairs
* Get pairs.
*
* @param int $programID
* @param int $productID
@@ -177,7 +177,7 @@ class programplanModel extends model
}
/**
* Get gantt data
* Get gantt data.
*
* @param int $programID
* @param int $productID
@@ -322,7 +322,7 @@ class programplanModel extends model
}
/**
* Get total percent
* Get total percent.
*
* @param int $plan
* @access public
@@ -343,7 +343,7 @@ class programplanModel extends model
}
/**
* Process plans
* Process plans.
*
* @param int $plans
* @access public
@@ -360,7 +360,7 @@ class programplanModel extends model
}
/**
* Process plan
* Process plan.
*
* @param int $plan
* @access public
@@ -401,7 +401,7 @@ class programplanModel extends model
}
/**
* Get duration
* Get duration.
*
* @param int $begin
* @param int $end
@@ -415,7 +415,7 @@ class programplanModel extends model
}
/**
* Create a plan
* Create a plan.
*
* @param int $programID
* @param int $parentID
@@ -598,7 +598,7 @@ class programplanModel extends model
}
/**
* Update a plan
* Update a plan.
*
* @param int $planID
* @access public
@@ -686,7 +686,7 @@ class programplanModel extends model
}
/**
* Print cell
* Print cell.
*
* @param int $col
* @param int $plan
@@ -793,7 +793,7 @@ class programplanModel extends model
}
/**
* Is create task
* Is create task.
*
* @param int $planID
* @access public
@@ -806,7 +806,7 @@ class programplanModel extends model
}
/**
* Is clickable
* Is clickable.
*
* @param int $plan
* @param int $action
@@ -824,7 +824,7 @@ class programplanModel extends model
}
/**
* Get milestones
* Get milestones.
*
* @param int $programID
* @access public
@@ -842,7 +842,7 @@ class programplanModel extends model
}
/**
* Get milestone by product
* Get milestone by product.
*
* @param int $productID
* @access public
@@ -861,7 +861,7 @@ class programplanModel extends model
}
/**
* Is parent
* Is parent.
*
* @param int $planID
* @access public
@@ -874,7 +874,7 @@ class programplanModel extends model
}
/**
* Get parent stage list
* Get parent stage list.
*
* @param int $planID
* @param int $productID
module/repo/control.php
+3 -1
View File
@@ -325,7 +325,7 @@ class repo extends control
$logType = 'dir';
$revisions = $this->repo->getCommits($repo, $path, $revision, $logType, $pager);
if($repo->SCM == 'Git' and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&branch={$this->cookie->repoBranch}"));
if($repo->SCM == 'Git' and $infos and empty($revisions)) $this->locate($this->repo->createLink('showSyncCommit', "repoID=$repoID&branch=" . base64_encode($this->cookie->repoBranch)));
$commiters = $this->loadModel('user')->getCommiters();
foreach($infos as $info) $info->committer = zget($commiters, $info->account, $info->account);
foreach($revisions as $log) $log->committer = zget($commiters, $log->committer, $log->committer);
@@ -703,6 +703,7 @@ class repo extends control
{
$this->repo->setMenu($this->repos, $repoID);
if($repoID == 0) $repoID = $this->session->repoID;
if($branch) $branch = base64_decode($branch);
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->showSyncCommit;
$this->view->position[] = $this->lang->repo->showSyncCommit;
@@ -819,6 +820,7 @@ class repo extends control
$repo = $this->repo->getRepoByID($repoID);
if(empty($repo)) die();
if($repo->SCM != 'Git') die('finish');
if($branch) $branch = base64_decode($branch);
$this->scm->setEngine($repo);
module/repo/view/showsynccommit.html.php
+1 -1
View File
@@ -28,7 +28,7 @@ $(function(){
<?php if(empty($branch)):?>
var link = createLink('repo', 'ajaxSyncCommit', "repoID=<?php echo $repoID?>");
<?php else:?>
var link = createLink('repo', 'ajaxSyncBranchCommit', "repoID=<?php echo $repoID?>&branch=<?php echo $branch;?>");
var link = createLink('repo', 'ajaxSyncBranchCommit', "repoID=<?php echo $repoID?>&branch=<?php echo base64_encode($branch);?>");
<?php endif;?>
function syncComments()
{
module/stage/control.php
+6 -6
View File
@@ -12,7 +12,7 @@
class stage extends control
{
/**
* Browse designs
* Browse stages.
*
* @param string $orderBy
* @access public
@@ -30,7 +30,7 @@ class stage extends control
}
/**
* Create a stage
* Create a stage.
*
* @access public
* @return void
@@ -63,7 +63,7 @@ class stage extends control
}
/**
* Batch create
* Batch create stages.
*
* @access public
* @return void
@@ -95,7 +95,7 @@ class stage extends control
}
/**
* Edit a stage
* Edit a stage.
*
* @param int $stageID
* @access public
@@ -132,7 +132,7 @@ class stage extends control
}
/**
* Set type
* Set type.
*
* @access public
* @return void
@@ -160,7 +160,7 @@ class stage extends control
}
/**
* Delete a stage
* Delete a stage.
*
* @param int $stageID
* @param string $confirm
module/stage/model.php
+6 -6
View File
@@ -14,7 +14,7 @@
class stageModel extends model
{
/**
* Create a stage
* Create a stage.
*
* @access public
* @return int|bool
@@ -33,7 +33,7 @@ class stageModel extends model
}
/**
* Batch create
* Batch create stages.
*
* @access public
* @return bool
@@ -64,7 +64,7 @@ class stageModel extends model
}
/**
* Update a stage
* Update a stage.
*
* @param int $stageID
* @access public
@@ -86,7 +86,7 @@ class stageModel extends model
}
/**
* Get stages
* Get stages.
*
* @param string $orderBy
* @access public
@@ -98,7 +98,7 @@ class stageModel extends model
}
/**
* Get pairs
* Get pairs of stage.
*
* @access public
* @return array
@@ -117,7 +117,7 @@ class stageModel extends model
}
/**
* Get by id
* Get a stage by id.
*
* @param int $stageID
* @access public
module/workestimation/control.php
+1 -1
View File
@@ -12,7 +12,7 @@
class workestimation extends control
{
/**
* Index
* Index.
*
* @param int $program
* @access public
module/workestimation/model.php
+3 -3
View File
@@ -12,7 +12,7 @@
class workestimationModel extends model
{
/**
* Get a budget
* Get a budget.
*
* @param int $program
* @access public
@@ -24,7 +24,7 @@ class workestimationModel extends model
}
/**
* Get program scale
* Get program scale.
*
* @param int $program
* @access public
@@ -38,7 +38,7 @@ class workestimationModel extends model
}
/**
* Save a budget
* Save a budget.
*
* @param int $program
* @access public