diff --git a/module/account/control.php b/module/account/control.php index 6c1c7a6e5e..6f26839022 100644 --- a/module/account/control.php +++ b/module/account/control.php @@ -64,7 +64,7 @@ class account extends control if($_POST) { $account = form::data($this->config->account->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -93,7 +93,7 @@ class account extends control if($_POST) { $account = form::data($this->config->account->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/module/artifactrepo/control.php b/module/artifactrepo/control.php index 7b2d2aa32d..683cebed88 100644 --- a/module/artifactrepo/control.php +++ b/module/artifactrepo/control.php @@ -57,7 +57,7 @@ class artifactrepo extends control if($_POST) { $repo = form::data($this->config->artifactrepo->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); if($repo->products) $repo->products = ',' . $repo->products . ','; @@ -88,7 +88,7 @@ class artifactrepo extends control if($_POST) { $repo = form::data($this->config->artifactrepo->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); if($repo->products) $repo->products = ',' . $repo->products . ','; diff --git a/module/git/model.php b/module/git/model.php index 7b508a81d1..4a3d393347 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -199,9 +199,9 @@ class gitModel extends model { $scm = strtolower($repo->SCM); $userList = $this->loadModel($scm)->apiGetUsers((int)$repo->serviceHost); - $acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account'); + $accountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account'); - foreach($userList as $user) $accountPairs[$user->realname] = zget($acountIDPairs, $user->id, ''); + foreach($userList as $user) $accountPairs[$user->realname] = zget($accountIDPairs, $user->id, ''); } /* Update code commit history. */ diff --git a/module/gitea/control.php b/module/gitea/control.php index e14cfdd51f..db855f70a3 100644 --- a/module/gitea/control.php +++ b/module/gitea/control.php @@ -72,7 +72,7 @@ class gitea extends control if($_POST) { $gitea = form::data($this->config->gitea->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $result = $this->checkToken($gitea); if(is_array($result)) return $this->send($result); @@ -121,7 +121,7 @@ class gitea extends control if($_POST) { $gitea = form::data($this->config->gitea->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $result = $this->checkToken($gitea); if(is_array($result)) return $this->send($result); diff --git a/module/gitfox/control.php b/module/gitfox/control.php index 3178633db7..c1c17bd39c 100644 --- a/module/gitfox/control.php +++ b/module/gitfox/control.php @@ -23,7 +23,7 @@ class gitfox extends control if($_POST) { $gitfox = form::data($this->config->gitfox->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $this->checkToken($gitfox); $gitfoxID = $this->loadModel('pipeline')->create($gitfox); @@ -54,7 +54,7 @@ class gitfox extends control if($_POST) { $gitfox = form::data($this->config->gitfox->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $this->checkToken($gitfox, $gitfoxID); $this->loadModel('pipeline')->update($gitfoxID, $gitfox); diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 46fd90bf0f..38c7470b6b 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -76,7 +76,7 @@ class gitlab extends control if($_POST) { $gitlab = form::data($this->config->gitlab->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $this->checkToken($gitlab); $gitlabID = $this->loadModel('pipeline')->create($gitlab); @@ -126,7 +126,7 @@ class gitlab extends control if($_POST) { $gitlab = form::data($this->config->gitlab->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $this->checkToken($gitlab, $gitlabID); $this->loadModel('pipeline')->update($gitlabID, $gitlab); diff --git a/module/gogs/control.php b/module/gogs/control.php index 96c9846a8a..6c5e95c437 100644 --- a/module/gogs/control.php +++ b/module/gogs/control.php @@ -71,7 +71,7 @@ class gogs extends control if($_POST) { $gogs = form::data($this->config->gogs->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $priv = $this->checkToken($gogs); if(is_array($priv)) return $this->send($priv); @@ -121,7 +121,7 @@ class gogs extends control if($_POST) { $gogs = form::data($this->config->gogs->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $this->checkToken($gogs); $this->loadModel('pipeline')->update($gogsID, $gogs); diff --git a/module/jenkins/control.php b/module/jenkins/control.php index 51d20e77f7..06a0a99e62 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -39,7 +39,7 @@ class jenkins extends control if($_POST) { $jenkins = form::data($this->config->jenkins->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $this->jenkinsZen->checkTokenAccess($jenkins->url, $jenkins->account, $jenkins->password, $jenkins->token); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); @@ -66,7 +66,7 @@ class jenkins extends control if($_POST) { $jenkins = form::data($this->config->jenkins->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $this->jenkinsZen->checkTokenAccess($jenkins->url, $jenkins->account, $jenkins->password, $jenkins->token); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); diff --git a/module/job/control.php b/module/job/control.php index b087fa4229..bc188b37a1 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -100,7 +100,7 @@ class job extends control ->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '') ->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0) ->setIF($this->post->frame != 'sonarqube', 'projectKey', '') - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $jobID = $this->job->create($job); @@ -143,7 +143,7 @@ class job extends control ->setIF($this->post->useZentao != '1' || $this->post->triggerType != 'tag', 'lastTag', '') ->setIF($this->post->frame != 'sonarqube', 'sonarqubeServer', 0) ->setIF($this->post->frame != 'sonarqube', 'projectKey', '') - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $this->job->update($jobID, $job); diff --git a/module/mr/control.php b/module/mr/control.php index 69fda4bd63..fe42aed7b3 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -189,7 +189,7 @@ class mr extends control { $MR = form::data($this->config->mr->form->create) ->setIF($this->post->needCI == 0, 'jobID', 0) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $result = $this->mr->create($MR); return $this->send($result); @@ -254,7 +254,7 @@ class mr extends control { $MR = form::data($this->config->mr->form->edit) ->setIF($this->post->needCI == 0, 'jobID', 0) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $result = $this->mr->update($MRID, $MR); return $this->send($result); diff --git a/module/repo/model.php b/module/repo/model.php index e9cca6ca5d..3e4884a59e 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -1855,8 +1855,8 @@ class repoModel extends model $accountPairs = array(); $userList = $this->loadModel($repo->SCM)->apiGetUsers($repo->gitService); - $acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs($repo->gitService, strtolower($repo->SCM), 'openID,account'); - foreach($userList as $gitlabUser) $accountPairs[$gitlabUser->realname] = zget($acountIDPairs, $gitlabUser->id, ''); + $accountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs($repo->gitService, strtolower($repo->SCM), 'openID,account'); + foreach($userList as $gitlabUser) $accountPairs[$gitlabUser->realname] = zget($accountIDPairs, $gitlabUser->id, ''); foreach($data->commits as $commit) { diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index 6c0a45864d..91ed11686b 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -138,7 +138,7 @@ class sonarqube extends control if($_POST) { $sonarqube = form::data($this->config->sonarqube->form->create) - ->add('createdBy', $this->app->user->acount) + ->add('createdBy', $this->app->user->account) ->get(); $this->checkToken($sonarqube, 0); $sonarqubeID = $this->loadModel('pipeline')->create($sonarqube); @@ -202,7 +202,7 @@ class sonarqube extends control $this->checkToken($oldSonarQube, $sonarqubeID); $sonarqube = form::data($this->config->sonarqube->form->edit) - ->add('editedBy', $this->app->user->acount) + ->add('editedBy', $this->app->user->account) ->get(); $sonarqube->token = $oldSonarQube->token; $this->pipeline->update($sonarqubeID, $sonarqube);