* Add execution task gitlab.
This commit is contained in:
@@ -67,6 +67,7 @@ $lang->task->storyVersion = "{$lang->SRCommon}版本";
|
||||
$lang->task->color = '标题颜色';
|
||||
$lang->task->name = '任务名称';
|
||||
$lang->task->type = '任务类型';
|
||||
$lang->task->sync = '同步平台';
|
||||
$lang->task->pri = '优先级';
|
||||
$lang->task->mailto = '抄送给';
|
||||
$lang->task->estimate = '最初预计';
|
||||
@@ -163,6 +164,9 @@ $lang->task->typeList['ui'] = '界面';
|
||||
$lang->task->typeList['affair'] = '事务';
|
||||
$lang->task->typeList['misc'] = '其他';
|
||||
|
||||
$lang->task->syncList[''] = '';
|
||||
$lang->task->syncList['gitlab'] = 'gitlab';
|
||||
|
||||
$lang->task->priList[0] = '';
|
||||
$lang->task->priList[1] = '1';
|
||||
$lang->task->priList[2] = '2';
|
||||
|
||||
@@ -45,6 +45,10 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->task->sync;?></th>
|
||||
<td><?php echo html::select('type', $lang->task->syncList, '', "class='form-control chosen' onchange='setOwners(this.value)'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->task->module;?></th>
|
||||
<td id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value, $execution->id)'");?></td>
|
||||
|
||||
@@ -2388,20 +2388,25 @@ class userModel extends model
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getTeamMemberPairs($objectID, $type = 'project', $params = '', $usersToAppended = '')
|
||||
public function getTeamMemberPairs($objectID, $type = 'project', $params = '', $usersToAppended = '', $sync = '')
|
||||
{
|
||||
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
|
||||
|
||||
$keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
|
||||
$users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
|
||||
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
|
||||
->leftJoin(TABLE_OAUTH)->alias('t3')->on('t2.account = t3.account')
|
||||
->where('t1.root')->eq((int)$objectID)
|
||||
->andWhere('t1.type')->eq($type)
|
||||
->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted))
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->fi()
|
||||
->beginIF(!empty($sync))
|
||||
->andWhere('providerType')->eq($sync)
|
||||
->fi()
|
||||
->fetchAll($keyField);
|
||||
|
||||
a($this->dao->get());exit;
|
||||
if($usersToAppended) $users += $this->dao->select("id, account, realname")->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll($keyField);
|
||||
|
||||
if(!$users) return array('' => '');
|
||||
|
||||
Reference in New Issue
Block a user