diff --git a/module/gitlab/config/form.php b/module/gitlab/config/form.php index 5a1069e123..7066b3415c 100644 --- a/module/gitlab/config/form.php +++ b/module/gitlab/config/form.php @@ -1,5 +1,4 @@ gitlab->form = new stdclass(); $config->gitlab->form->create = array(); $config->gitlab->form->create['appType'] = array('type' => 'string', 'required' => true, 'default' => 'gitlab'); @@ -7,7 +6,6 @@ $config->gitlab->form->create['type'] = array('type' => 'string', 'requ $config->gitlab->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->create['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->create['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); -$config->gitlab->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); $config->gitlab->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now()); $config->gitlab->form->create['private'] = array('type' => 'string', 'required' => false, 'default' => uniqid()); @@ -15,7 +13,6 @@ $config->gitlab->form->edit = array(); $config->gitlab->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->edit['url'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->gitlab->form->edit['token'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); -$config->gitlab->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); $config->gitlab->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now()); $config->gitlab->form->user = new stdclass(); diff --git a/module/gitlab/control.php b/module/gitlab/control.php index c8fd774cfb..46fd90bf0f 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -75,7 +75,9 @@ class gitlab extends control { if($_POST) { - $gitlab = form::data($this->config->gitlab->form->create)->get(); + $gitlab = form::data($this->config->gitlab->form->create) + ->add('createdBy', $this->app->user->acount) + ->get(); $this->checkToken($gitlab); $gitlabID = $this->loadModel('pipeline')->create($gitlab); @@ -123,7 +125,9 @@ class gitlab extends control if($_POST) { - $gitlab = form::data($this->config->gitlab->form->edit)->get(); + $gitlab = form::data($this->config->gitlab->form->edit) + ->add('editedBy', $this->app->user->acount) + ->get(); $this->checkToken($gitlab, $gitlabID); $this->loadModel('pipeline')->update($gitlabID, $gitlab); $gitLab = $this->gitlab->getByID($gitlabID);