diff --git a/config/zentaopms.php b/config/zentaopms.php index b5e0f771de..5777863d6e 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -179,7 +179,7 @@ define('TABLE_LOG', '`' . $config->db->prefix . 'log`'); define('TABLE_SCORE', '`' . $config->db->prefix . 'score`'); define('TABLE_NOTIFY', '`' . $config->db->prefix . 'notify`'); define('TABLE_OAUTH', '`' . $config->db->prefix . 'oauth`'); -define('TABLE_PIPLINE', '`' . $config->db->prefix . 'jenkins`'); +define('TABLE_PIPELINE', '`' . $config->db->prefix . 'jenkins`'); define('TABLE_JOB', '`' . $config->db->prefix . 'job`'); define('TABLE_COMPILE', '`' . $config->db->prefix . 'compile`'); diff --git a/module/pipline/config.php b/module/pipeline/config.php similarity index 100% rename from module/pipline/config.php rename to module/pipeline/config.php diff --git a/module/pipline/lang/zh-cn.php b/module/pipeline/lang/zh-cn.php similarity index 100% rename from module/pipline/lang/zh-cn.php rename to module/pipeline/lang/zh-cn.php diff --git a/module/pipline/model.php b/module/pipeline/model.php similarity index 91% rename from module/pipline/model.php rename to module/pipeline/model.php index eb73a6a595..38fc423af9 100644 --- a/module/pipline/model.php +++ b/module/pipeline/model.php @@ -21,7 +21,7 @@ class piplineModel extends model */ public function getByID($id) { - $pipline = $this->dao->select('*')->from(TABLE_PIPLINE)->where('id')->eq($id)->fetch(); + $pipline = $this->dao->select('*')->from(TABLE_PIPELINE)->where('id')->eq($id)->fetch(); $pipline->password = base64_decode($pipline->password); return $pipline; } @@ -37,7 +37,7 @@ class piplineModel extends model */ public function getList($type = 'jenkins', $orderBy = 'id_desc', $pager = null) { - return $this->dao->select('*')->from(TABLE_PIPLINE) + return $this->dao->select('*')->from(TABLE_PIPELINE) ->where('deleted')->eq('0') ->AndWhere('type')->eq($type) ->orderBy($orderBy) @@ -52,7 +52,7 @@ class piplineModel extends model */ public function getPairs($type) { - $pipline = $this->dao->select('id,name')->from(TABLE_PIPLINE) + $pipline = $this->dao->select('id,name')->from(TABLE_PIPELINE) ->where('deleted')->eq('0') ->AndWhere('type')->eq($type) ->orderBy('id')->fetchPairs('id', 'name'); @@ -77,7 +77,7 @@ class piplineModel extends model $pipline->password = base64_encode($pipline->password); - $this->dao->insert(TABLE_PIPLINE)->data($pipline) + $this->dao->insert(TABLE_PIPELINE)->data($pipline) ->batchCheck($this->config->pipline->create->requiredFields, 'notempty') ->batchCheck("url", 'URL') ->autoCheck() @@ -103,7 +103,7 @@ class piplineModel extends model $pipline->password = base64_encode($pipline->password); - $this->dao->update(TABLE_PIPLINE)->data($pipline) + $this->dao->update(TABLE_PIPELINE)->data($pipline) ->batchCheck($this->config->pipline->edit->requiredFields, 'notempty') ->batchCheck("url", 'URL') ->autoCheck()