diff --git a/db/update16.0.beta1.sql b/db/update16.0.beta1.sql index 102e159f6b..c0a73f7a55 100644 --- a/db/update16.0.beta1.sql +++ b/db/update16.0.beta1.sql @@ -9,3 +9,7 @@ ALTER TABLE `zt_bug` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`; UPDATE `zt_grouppriv` SET `method`='addReview' where `module`='mr' and `method`='addBug'; ALTER TABLE `zt_mr` ADD `removeSourceBranch` ENUM('0','1') NOT NULL DEFAULT '0' AFTER `compileStatus`; + +ALTER TABLE zt_repo ADD fileServerUrl text COLLATE 'utf8_general_ci' NULL AFTER `job`; +ALTER TABLE zt_repo ADD fileServerAccount varchar(40) NOT NULL default '' AFTER `fileServerUrl`; +ALTER TABLE zt_repo ADD fileServerPassword varchar(100) NOT NULL default '' AFTER `fileServerAccount`; diff --git a/module/job/model.php b/module/job/model.php index 2e69ab65f1..6d647e78d9 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -66,6 +66,24 @@ class jobModel extends model ->fetchAll('id'); } + /** + * Get job list by RepoID. + * + * @param int $repoID + * @param string $engine + * @access public + * @return array + */ + public function getPairs($repoID, $engine = '') + { + return $this->dao->select('id, name')->from(TABLE_JOB) + ->where('deleted')->eq('0') + ->andWhere('repo')->eq($repoID) + ->beginIF($engine)->andWhere('engine')->eq($engine)->fi() + ->orderBy('id_desc') + ->fetchPairs(); + } + /** * Get list by triggerType field. * diff --git a/module/repo/control.php b/module/repo/control.php index f021d47d62..107b73dcb8 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -83,7 +83,7 @@ class repo extends control $repoID = $this->repo->saveState(0, $objectID); if($this->viewType !== 'json') $this->commonAction($repoID, $objectID); - $repoList = $this->repo->getList(0, $orderBy); + $repoList = $this->repo->getList(0, '', $orderBy); /* Pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index e5fa02bbc2..0127e77486 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -48,48 +48,52 @@ $lang->repo->line = 'Line'; $lang->repo->expand = 'Unfold'; $lang->repo->collapse = 'Fold'; -$lang->repo->id = 'ID'; -$lang->repo->SCM = 'Type'; -$lang->repo->name = 'Name'; -$lang->repo->path = 'Path'; -$lang->repo->prefix = 'Prefix'; -$lang->repo->config = 'Config'; -$lang->repo->desc = 'Description'; -$lang->repo->account = 'Username'; -$lang->repo->password = 'Password'; -$lang->repo->encoding = 'Encoding'; -$lang->repo->client = 'Client Path'; -$lang->repo->size = 'Size'; -$lang->repo->revision = 'Revision'; -$lang->repo->revisionA = 'Revision'; -$lang->repo->revisions = 'Revision'; -$lang->repo->time = 'Date'; -$lang->repo->committer = 'Committer'; -$lang->repo->commits = 'Commits'; -$lang->repo->synced = 'Initialize Sync'; -$lang->repo->lastSync = 'Last Sync'; -$lang->repo->deleted = 'Deleted'; -$lang->repo->commit = 'Commit'; -$lang->repo->comment = 'Comment'; -$lang->repo->view = 'View File'; -$lang->repo->viewA = 'View'; -$lang->repo->log = 'Revision Log'; -$lang->repo->blame = 'Blame'; -$lang->repo->date = 'Date'; -$lang->repo->diff = 'Diff'; -$lang->repo->diffAB = 'Diff'; -$lang->repo->diffAll = 'Diff All'; -$lang->repo->viewDiff = 'View diff'; -$lang->repo->allLog = 'All Revisions'; -$lang->repo->location = 'Location'; -$lang->repo->file = 'File'; -$lang->repo->action = 'Action'; -$lang->repo->code = 'Code'; -$lang->repo->review = 'Repo Review'; -$lang->repo->acl = 'Privilege'; -$lang->repo->group = 'Group'; -$lang->repo->user = 'User'; -$lang->repo->info = 'Version Info'; +$lang->repo->id = 'ID'; +$lang->repo->SCM = 'Type'; +$lang->repo->name = 'Name'; +$lang->repo->path = 'Path'; +$lang->repo->prefix = 'Prefix'; +$lang->repo->config = 'Config'; +$lang->repo->desc = 'Description'; +$lang->repo->account = 'Username'; +$lang->repo->password = 'Password'; +$lang->repo->encoding = 'Encoding'; +$lang->repo->client = 'Client Path'; +$lang->repo->size = 'Size'; +$lang->repo->revision = 'Revision'; +$lang->repo->revisionA = 'Revision'; +$lang->repo->revisions = 'Revision'; +$lang->repo->time = 'Date'; +$lang->repo->committer = 'Committer'; +$lang->repo->commits = 'Commits'; +$lang->repo->synced = 'Initialize Sync'; +$lang->repo->lastSync = 'Last Sync'; +$lang->repo->deleted = 'Deleted'; +$lang->repo->commit = 'Commit'; +$lang->repo->comment = 'Comment'; +$lang->repo->view = 'View File'; +$lang->repo->viewA = 'View'; +$lang->repo->log = 'Revision Log'; +$lang->repo->blame = 'Blame'; +$lang->repo->date = 'Date'; +$lang->repo->diff = 'Diff'; +$lang->repo->diffAB = 'Diff'; +$lang->repo->diffAll = 'Diff All'; +$lang->repo->viewDiff = 'View diff'; +$lang->repo->allLog = 'All Revisions'; +$lang->repo->location = 'Location'; +$lang->repo->file = 'File'; +$lang->repo->action = 'Action'; +$lang->repo->code = 'Code'; +$lang->repo->review = 'Repo Review'; +$lang->repo->acl = 'Privilege'; +$lang->repo->group = 'Group'; +$lang->repo->user = 'User'; +$lang->repo->info = 'Version Info'; +$lang->repo->job = 'Job'; +$lang->repo->fileServerUrl = 'File Server Url'; +$lang->repo->fileServerAccount = 'File Server Account'; +$lang->repo->fileServerPassword = 'File Server Password'; $lang->repo->title = 'Title'; $lang->repo->status = 'Status'; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 5283beb6f4..c561210732 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -48,48 +48,52 @@ $lang->repo->line = '行'; $lang->repo->expand = '点击展开'; $lang->repo->collapse = '点击折叠'; -$lang->repo->id = 'ID'; -$lang->repo->SCM = '类型'; -$lang->repo->name = '名称'; -$lang->repo->path = '地址'; -$lang->repo->prefix = '地址扩展'; -$lang->repo->config = '配置目录'; -$lang->repo->desc = '描述'; -$lang->repo->account = '用户名'; -$lang->repo->password = '密码'; -$lang->repo->encoding = '编码'; -$lang->repo->client = '客户端'; -$lang->repo->size = '大小'; -$lang->repo->revision = '查看版本'; -$lang->repo->revisionA = '版本'; -$lang->repo->revisions = '版本'; -$lang->repo->time = '提交时间'; -$lang->repo->committer = '作者'; -$lang->repo->commits = '提交数'; -$lang->repo->synced = '初始化同步'; -$lang->repo->lastSync = '最后同步时间'; -$lang->repo->deleted = '已删除'; -$lang->repo->commit = '提交'; -$lang->repo->comment = '注释'; -$lang->repo->view = '查看文件'; -$lang->repo->viewA = '查看'; -$lang->repo->log = '版本历史'; -$lang->repo->blame = '追溯'; -$lang->repo->date = '日期'; -$lang->repo->diff = '比较差异'; -$lang->repo->diffAB = '比较'; -$lang->repo->diffAll = '全部比较'; -$lang->repo->viewDiff = '查看差异'; -$lang->repo->allLog = '所有版本'; -$lang->repo->location = '位置'; -$lang->repo->file = '文件'; -$lang->repo->action = '操作'; -$lang->repo->code = '代码'; -$lang->repo->review = '评审'; -$lang->repo->acl = '权限'; -$lang->repo->group = '分组'; -$lang->repo->user = '用户'; -$lang->repo->info = '版本信息'; +$lang->repo->id = 'ID'; +$lang->repo->SCM = '类型'; +$lang->repo->name = '名称'; +$lang->repo->path = '地址'; +$lang->repo->prefix = '地址扩展'; +$lang->repo->config = '配置目录'; +$lang->repo->desc = '描述'; +$lang->repo->account = '用户名'; +$lang->repo->password = '密码'; +$lang->repo->encoding = '编码'; +$lang->repo->client = '客户端'; +$lang->repo->size = '大小'; +$lang->repo->revision = '查看版本'; +$lang->repo->revisionA = '版本'; +$lang->repo->revisions = '版本'; +$lang->repo->time = '提交时间'; +$lang->repo->committer = '作者'; +$lang->repo->commits = '提交数'; +$lang->repo->synced = '初始化同步'; +$lang->repo->lastSync = '最后同步时间'; +$lang->repo->deleted = '已删除'; +$lang->repo->commit = '提交'; +$lang->repo->comment = '注释'; +$lang->repo->view = '查看文件'; +$lang->repo->viewA = '查看'; +$lang->repo->log = '版本历史'; +$lang->repo->blame = '追溯'; +$lang->repo->date = '日期'; +$lang->repo->diff = '比较差异'; +$lang->repo->diffAB = '比较'; +$lang->repo->diffAll = '全部比较'; +$lang->repo->viewDiff = '查看差异'; +$lang->repo->allLog = '所有版本'; +$lang->repo->location = '位置'; +$lang->repo->file = '文件'; +$lang->repo->action = '操作'; +$lang->repo->code = '代码'; +$lang->repo->review = '评审'; +$lang->repo->acl = '权限'; +$lang->repo->group = '分组'; +$lang->repo->user = '用户'; +$lang->repo->info = '版本信息'; +$lang->repo->job = '构建任务'; +$lang->repo->fileServerUrl = '预合并后上传服务器目录'; +$lang->repo->fileServerAccount = '文件服务器登录用户名'; +$lang->repo->fileServerPassword = '文件服务器登录密码'; $lang->repo->title = '标题'; $lang->repo->status = '状态'; diff --git a/module/repo/model.php b/module/repo/model.php index a69ce07eab..c975b82b0f 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -118,15 +118,17 @@ class repoModel extends model * Get repo list. * * @param int $projectID + * @param string $SCM * @param string $orderBy * @param object $pager * @access public * @return array */ - public function getList($projectID = 0, $orderBy = 'id_desc', $pager = null) + public function getList($projectID = 0, $SCM = '', $orderBy = 'id_desc', $pager = null) { $repos = $this->dao->select('*')->from(TABLE_REPO) ->where('deleted')->eq('0') + ->beginIF($SCM)->andWhere('SCM')->eq($SCM)->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll('id');