From 19905f7edac054c45914eaf250e95dfef78f92b2 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 14 Jan 2022 11:26:28 +0800
Subject: [PATCH]  * Fix bug #18450,18447.

---
 module/action/lang/en.php    | 6 ++++++
 module/action/lang/zh-cn.php | 6 ++++++
 module/job/control.php       | 6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 7cda117c50..3e631bf71f 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -571,6 +571,12 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Desktop';
 $lang->action->dynamicAction->entry['created'] = 'Add Application';
 $lang->action->dynamicAction->entry['edited']  = 'Edit Application';
 
+$lang->action->dynamicAction->job['created']   = 'Create Job';
+$lang->action->dynamicAction->job['edited']    = 'Edit Job';
+$lang->action->dynamicAction->job['executed']  = 'Execute Job';
+$lang->action->dynamicAction->job['deleted']   = 'Delete Job';
+$lang->action->dynamicAction->job['undeleted'] = 'Undelete Job';
+
 $lang->action->dynamicAction->sonarqube['created'] = 'Create SonarQube Server';
 $lang->action->dynamicAction->sonarqube['edited']  = 'Edit SonarQube Server';
 $lang->action->dynamicAction->sonarqube['deleted'] = 'Delete SonarQube Server';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index eded439ac1..ffc2876bf6 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -571,6 +571,12 @@ $lang->action->dynamicAction->user['loginxuanxuan'] = '登录客户端';
 $lang->action->dynamicAction->entry['created'] = '添加应用';
 $lang->action->dynamicAction->entry['edited']  = '编辑应用';
 
+$lang->action->dynamicAction->job['created']   = '创建构建任务';
+$lang->action->dynamicAction->job['edited']    = '编辑构建任务';
+$lang->action->dynamicAction->job['executed']  = '执行构建任务';
+$lang->action->dynamicAction->job['deleted']   = '删除构建任务';
+$lang->action->dynamicAction->job['undeleted'] = '还原构建任务';
+
 $lang->action->dynamicAction->sonarqube['created'] = '创建SonarQube服务器';
 $lang->action->dynamicAction->sonarqube['edited']  = '设置SonarQube服务器';
 $lang->action->dynamicAction->sonarqube['deleted'] = '删除SonarQube服务器';
diff --git a/module/job/control.php b/module/job/control.php
index d3ed975c64..53f900220c 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -88,6 +88,8 @@ class job extends control
                 }
                 return $this->send(array('result' => 'fail', 'message' => $errors));
             }
+
+            $this->loadModel('action')->create('job', $jobID, 'created');
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $jobID));
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
@@ -163,6 +165,8 @@ class job extends control
                 }
                 return $this->send(array('result' => 'fail', 'message' => $errors));
             }
+
+            $this->loadModel('action')->create('job', $id, 'edited');
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
@@ -427,7 +431,7 @@ class job extends control
     public function ajaxCheckSonarqubeLink($repoID, $jobID = 0)
     {
         $repo = $this->loadModel('job')->getSonarqubeByRepo(array($repoID), $jobID);
-        if(!empty($repo)) 
+        if(!empty($repo))
         {
             $message = sprintf($this->lang->job->repoExists, $repo[$repoID]->id . '-' . $repo[$repoID]->name);
             $this->send(array('result' => 'fail', 'message' => $message));