Merge branch 'devops_unjenkins' into 'master'

* Restore jenkins

See merge request easycorp/zentaopms!7231

module/jenkins/control.php

@@ -125,9 +125,9 @@ class jenkins extends control
      */
     public function ajaxGetJenkinsTasks($id)
     {
-        if(empty($id)) return print('');
+        if(empty($id)) return print(json_encode(array('' => '')));
 
-        $this->view->tasks = $this->jenkins->getTasks($id, 3);
-        $this->display();
+        $tasks = $this->jenkins->getTasks($id);
+        echo json_encode($tasks);
     }
 }

module/job/js/create.js

@@ -18,7 +18,7 @@ $(document).ready(function()
         $('#frameBox .loading').remove();
         $('#frameBox .input-group').append(html);
         $('#frameBox #frame').chosen();
-
+        
         $('#frame').change();
     }
     getFrameSelect('');
@@ -171,16 +171,23 @@ $(document).ready(function()
     $('#jkServer').change(function()
     {
         var jenkinsID = $(this).val();
-        $('#jenkinsServerTR .dropdown,.input-group-addon').hide();
+        $('#jenkinsServerTR #jkTask').remove();
+        $('#jenkinsServerTR #jkTask_chosen').remove();
         $('#jenkinsServerTR .input-group').append("<div class='load-indicator loading'></div>");
-        setJenkinsJob('', '');
-
-        $.get(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
+        $.getJSON(createLink('jenkins', 'ajaxGetJenkinsTasks', 'jenkinsID=' + jenkinsID), function(tasks)
         {
+            html = "<select id='jkTask' name='jkTask' class='form-control'>";
+            for(taskKey in tasks)
+            {
+                var task = tasks[taskKey];
+                html += "<option value='" + taskKey + "'>" + task + "</option>";
+            }
+            html += '</select>';
             $('#jenkinsServerTR .loading').remove();
-            $('#dropMenuTasks').html(tasks);
-            $('#jenkinsServerTR .dropdown,.input-group-addon').show();
-        });
+            $('#jenkinsServerTR .input-group').append(html);
+
+            $('#jenkinsServerTR #jkTask').chosen({drop_direction: 'auto'});
+        })
 
         /* There has been a problem with handling the prompt label. */
         $('#jkTaskLabel').remove();
@@ -246,18 +253,3 @@ $(document).ready(function()
     $('#engine').change();
     $('#triggerType').change();
 });
-
-/**
- * Set jenkins job.
- *
- * @param string $name
- * @param string $task
- * @access public
- * @return void
- */
-function setJenkinsJob(name, task)
-{
-    if(name) $('.jktask-label').removeClass('text-right');
-    $('#jkTask').val(task);
-    $('.jktask-label .text').html(name);
-}

module/job/view/create.html.php

@@ -106,17 +106,13 @@
           </tr>
           <tr id="jenkinsServerTR">
             <th><?php echo $lang->job->jkHost; ?></th>
-            <td colspan='2'>
+            <td colspan='2' class='required'>
               <div class='table-row'>
                 <div class='table-col'><?php echo html::select('jkServer', $jenkinsServerList, '', "class='form-control chosen'"); ?></div>
                 <div class='table-col'>
                   <div class='input-group'>
                     <span class='input-group-addon'><?php echo $lang->job->pipeline;?></span>
-                    <div class='dropdown'>
-                    <?php echo html::hidden('jkTask');?>
-                    <button data-toggle='dropdown' type='button' class='btn jktask-label required text-right'  title=''><span class='text'></span> <span class='caret' style='margin-bottom: -1px'></span></button>
-                    <div id='dropMenuTasks' class='dropdown-menu search-list' data-ride='searchList' data-url=''></div>
-                    </div>
+                    <?php echo html::select('jkTask', array('' => ''), '', "class='form-control chosen'"); ?>
                   </div>
                 </div>
               </div>