diff --git a/module/compile/control.php b/module/compile/control.php index 81df93f34a..6c77d2c51a 100644 --- a/module/compile/control.php +++ b/module/compile/control.php @@ -37,7 +37,7 @@ class compile extends control * @access public * @return void */ - public function browse($repoID = 0, $jobID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function browse($repoID = 0, $jobID = 0, $orderBy = 'createdDate_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { $this->loadModel('ci'); if($jobID) @@ -48,7 +48,7 @@ class compile extends control $this->view->job = $job; } - $this->compile->syncCompile($repoID, $jobID); + if($repoID || $jobID) $this->compile->syncCompile($repoID, $jobID); $this->app->loadLang('job'); if($repoID) $this->ci->setMenu($repoID); diff --git a/module/git/model.php b/module/git/model.php index 169740dd68..3606fff72e 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -217,7 +217,7 @@ class gitModel extends model { foreach(explode(',', $job->comment) as $comment) { - if(strpos($log->msg, $comment) !== false) $this->loadModel('compile')->createByJob($job->id); + if(strpos($log->msg, $comment) !== false) $this->loadModel('job')->exec($job->id); } } $commits += count($logs); @@ -404,9 +404,9 @@ class gitModel extends model } /** - * Pring log. + * Print log. * - * @param sting $log + * @param string $log * @access public * @return void */ diff --git a/module/job/js/edit.ui.js b/module/job/js/edit.ui.js index 3ded553541..774a38e7d5 100644 --- a/module/job/js/edit.ui.js +++ b/module/job/js/edit.ui.js @@ -62,7 +62,6 @@ function changeRepo(event) $productPicker.render({items: data}); $productPicker.$.clear(); if(data[1]) $productPicker.$.setValue(data[1].value); - console.log($productPicker.options); } }); @@ -165,7 +164,14 @@ function changeJenkinsServer(event) function changeTriggerType(event) { - var type = $(event.target).val(); + if(typeof(event) == 'object') + { + var type = $(event.target).val(); + } + else + { + var type = event; + } $('.svn-fields').addClass('hidden'); $('.comment-fields').addClass('hidden'); $('.custom-fields').addClass('hidden'); @@ -189,7 +195,7 @@ function changeSonarqubeServer(event) $(document).ready(function() { changeEngine(engine); - $('[name=triggerType]').val(job.triggerType).trigger('change'); + changeTriggerType(job.triggerType); $(document).on('click', '.dropmenu-list li.tree-item', function() {