From af258f8fdf26e0cd2904820a387b50bddfcee7df Mon Sep 17 00:00:00 2001
From: aaronchen2k <462826@qq.com>
Date: Tue, 14 Jan 2020 17:33:41 +0800
Subject: [PATCH] move exe button to edit citask page, add request success tips

---
 module/ci/css/browsecitask.css       |  1 +
 module/ci/js/browsecitask.js         |  4 ++++
 module/ci/js/editcitask.js           | 14 ++++++++++++++
 module/ci/lang/zh-cn.php             |  1 +
 module/ci/view/browsecitask.html.php |  1 -
 module/ci/view/editcitask.html.php   |  4 +++-
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 module/ci/css/browsecitask.css
 create mode 100644 module/ci/js/browsecitask.js

diff --git a/module/ci/css/browsecitask.css b/module/ci/css/browsecitask.css
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/module/ci/css/browsecitask.css
@@ -0,0 +1 @@
+
diff --git a/module/ci/js/browsecitask.js b/module/ci/js/browsecitask.js
new file mode 100644
index 0000000000..0a12f8df4f
--- /dev/null
+++ b/module/ci/js/browsecitask.js
@@ -0,0 +1,4 @@
+$(function()
+{
+
+})
\ No newline at end of file
diff --git a/module/ci/js/editcitask.js b/module/ci/js/editcitask.js
index e0fcdf37cf..69885bc377 100644
--- a/module/ci/js/editcitask.js
+++ b/module/ci/js/editcitask.js
@@ -3,6 +3,20 @@ $(function()
     triggerTypeChanged(triggerType);
 });
 
+function exeCitask(id) {
+    var link = createLink('ci', 'exeCitask', 'id=' + id);
+    console.log(link);
+    $.ajax({
+        type:"POST",
+        url: link,
+        data: {},
+        datatype: "json",
+        success:function(str){
+            $('.exe-citask-button').tooltip('show', '发送执行请求成功！');
+        }
+    });
+}
+
 function triggerTypeChanged(type) {
     if(type == 'tag') {
         $('.tag-fields').removeClass('hidden');
diff --git a/module/ci/lang/zh-cn.php b/module/ci/lang/zh-cn.php
index bb797084e9..2d2c6fdaa8 100644
--- a/module/ci/lang/zh-cn.php
+++ b/module/ci/lang/zh-cn.php
@@ -59,6 +59,7 @@ $lang->citask->common                  = '构建任务';
 $lang->citask->browse                  = '浏览构建任务';
 $lang->citask->create                  = '添加构建任务';
 $lang->citask->edit                    = '编辑构建任务';
+$lang->citask->exeNow                  = '立即执行';
 $lang->citask->delete                  = '删除构建任务';
 $lang->citask->confirmDelete           = '确认删除该构建任务吗？';
 
diff --git a/module/ci/view/browsecitask.html.php b/module/ci/view/browsecitask.html.php
index d0f4d2188c..a455aab29d 100644
--- a/module/ci/view/browsecitask.html.php
+++ b/module/ci/view/browsecitask.html.php
@@ -54,7 +54,6 @@
 
                         <td class='c-actions text-right'>
                             <?php
-                            common::printIcon('ci', 'exeCitask', "citaskID=$id", '', 'list',  'play');
                             common::printIcon('ci', 'editCitask', "citaskID=$id", '', 'list',  'edit');
 
                             if (common::hasPriv('ci', 'deleteCitask')) {
diff --git a/module/ci/view/editcitask.html.php b/module/ci/view/editcitask.html.php
index 70be5ca34d..5f651306a9 100644
--- a/module/ci/view/editcitask.html.php
+++ b/module/ci/view/editcitask.html.php
@@ -106,9 +106,11 @@
                     </tr>
                     <tr>
                         <th></th>
-                        <td class='text-center form-actions'>
+                        <td colspan="2" class='text-center form-actions'>
                             <?php echo html::submitButton(); ?>
                             <?php echo html::backButton(); ?>
+                            &nbsp;
+                            <?php echo html::commonButton($lang->citask->exeNow, "onclick=exeCitask($citask->id)  data-tip-class='tooltip-success'", "btn btn-info exe-citask-button"); ?>
                         </td>
                     </tr>
                 </table>