* Refactor design::getCommit method.
This commit is contained in:
@@ -316,18 +316,22 @@ class designModel extends model
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取设计关联的代码提交。
|
||||
* Get commit.
|
||||
*
|
||||
* @param int $designID
|
||||
* @param int $pager
|
||||
* @param int $designID
|
||||
* @param object $pager
|
||||
* @access public
|
||||
* @return object
|
||||
* @return object|bool
|
||||
*/
|
||||
public function getCommit($designID = 0, $pager = null)
|
||||
public function getCommit(int $designID = 0, object $pager = null): object|bool
|
||||
{
|
||||
$design = $this->dao->select('*')->from(TABLE_DESIGN)->where('id')->eq($designID)->fetch();
|
||||
if(!$design) return false;
|
||||
|
||||
$design->commit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->in($design->commit)->page($pager)->fetchAll('id');
|
||||
$design->project = (int)$design->project;
|
||||
$design->product = (int)$design->product;
|
||||
$design->commit = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('id')->in($design->commit)->page($pager)->fetchAll('id');
|
||||
|
||||
return $design;
|
||||
}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
|
||||
include dirname(dirname(dirname(__FILE__))) . '/class/design.class.php';
|
||||
su('admin');
|
||||
|
||||
/**
|
||||
|
||||
title=测试 designModel->getCommit();
|
||||
cid=1
|
||||
pid=1
|
||||
|
||||
*/
|
||||
|
||||
$design = new designTest();
|
||||
|
||||
r($design->getCommitTest()) && p() && e();
|
||||
Reference in New Issue
Block a user