diff --git a/module/pipeline/config.php b/module/pipeline/config.php index 0228d4f00c..29bc37b2ea 100644 --- a/module/pipeline/config.php +++ b/module/pipeline/config.php @@ -1,5 +1,5 @@ pipline->create = new stdclass(); -$config->pipline->edit = new stdclass(); -$config->pipline->create->requiredFields = 'name,url,type'; -$config->pipline->edit->requiredFields = 'name,url,type'; +$config->pipeline->create = new stdclass(); +$config->pipeline->edit = new stdclass(); +$config->pipeline->create->requiredFields = 'name,url,type'; +$config->pipeline->edit->requiredFields = 'name,url,type'; diff --git a/module/pipeline/lang/zh-cn.php b/module/pipeline/lang/zh-cn.php index 8d81ee7093..b949e9998d 100644 --- a/module/pipeline/lang/zh-cn.php +++ b/module/pipeline/lang/zh-cn.php @@ -1,7 +1,7 @@ pipline->id = 'ID'; -$lang->pipline->name = '名称'; -$lang->pipline->url = '服务地址'; -$lang->pipline->token = 'Token'; -$lang->pipline->account = '用户名'; -$lang->pipline->password = '密码'; +$lang->pipeline->id = 'ID'; +$lang->pipeline->name = '名称'; +$lang->pipeline->url = '服务地址'; +$lang->pipeline->token = 'Token'; +$lang->pipeline->account = '用户名'; +$lang->pipeline->password = '密码'; diff --git a/module/pipeline/model.php b/module/pipeline/model.php index 38fc423af9..b650093146 100644 --- a/module/pipeline/model.php +++ b/module/pipeline/model.php @@ -1,6 +1,6 @@ dao->select('*')->from(TABLE_PIPELINE)->where('id')->eq($id)->fetch(); - $pipline->password = base64_decode($pipline->password); - return $pipline; + $pipeline = $this->dao->select('*')->from(TABLE_PIPELINE)->where('id')->eq($id)->fetch(); + $pipeline->password = base64_decode($pipeline->password); + return $pipeline; } /** - * Get pipline list. + * Get pipeline list. * * @param string $type jenkins|gitlab * @param string $orderBy @@ -46,39 +46,39 @@ class piplineModel extends model } /** - * Get pipline pairs + * Get pipeline pairs * * @return array */ public function getPairs($type) { - $pipline = $this->dao->select('id,name')->from(TABLE_PIPELINE) + $pipeline = $this->dao->select('id,name')->from(TABLE_PIPELINE) ->where('deleted')->eq('0') ->AndWhere('type')->eq($type) ->orderBy('id')->fetchPairs('id', 'name'); - $pipline = array('' => '') + $pipline; - return $pipline; + $pipeline = array('' => '') + $pipeline; + return $pipeline; } /** - * Create a pipline. + * Create a pipeline. * * @access public * @return bool */ public function create($type) { - $pipline = fixer::input('post') + $pipeline = fixer::input('post') ->add('type', $type) ->add('createdBy', $this->app->user->account) ->add('createdDate', helper::now()) ->skipSpecial('url,token,account,password') ->get(); - $pipline->password = base64_encode($pipline->password); + $pipeline->password = base64_encode($pipeline->password); - $this->dao->insert(TABLE_PIPELINE)->data($pipline) - ->batchCheck($this->config->pipline->create->requiredFields, 'notempty') + $this->dao->insert(TABLE_PIPELINE)->data($pipeline) + ->batchCheck($this->config->pipeline->create->requiredFields, 'notempty') ->batchCheck("url", 'URL') ->autoCheck() ->exec(); @@ -87,7 +87,7 @@ class piplineModel extends model } /** - * Update a pipline. + * Update a pipeline. * * @param int $id * @access public @@ -95,16 +95,16 @@ class piplineModel extends model */ public function update($id) { - $pipline = fixer::input('post') + $pipeline = fixer::input('post') ->add('editedBy', $this->app->user->account) ->add('editedDate', helper::now()) ->skipSpecial('url,token,account,password') ->get(); - $pipline->password = base64_encode($pipline->password); + $pipeline->password = base64_encode($pipeline->password); - $this->dao->update(TABLE_PIPELINE)->data($pipline) - ->batchCheck($this->config->pipline->edit->requiredFields, 'notempty') + $this->dao->update(TABLE_PIPELINE)->data($pipeline) + ->batchCheck($this->config->pipeline->edit->requiredFields, 'notempty') ->batchCheck("url", 'URL') ->autoCheck() ->where('id')->eq($id)