diff --git a/lib/scm/scm.class.php b/lib/scm/scm.class.php index 4dc69b4236..4389aa26ab 100644 --- a/lib/scm/scm.class.php +++ b/lib/scm/scm.class.php @@ -15,7 +15,7 @@ class scm $className = $repo->SCM; if($className == 'Git') $className = 'GitRepo'; if(!class_exists($className)) require(strtolower($className) . '.class.php'); - $this->engine = new $className($repo->client, $repo->path, $repo->account, $repo->password, $repo->encoding); + $this->engine = new $className($repo->client, $repo->path, $repo->account, $repo->password, $repo->encoding); } /** diff --git a/module/job/control.php b/module/job/control.php index 6bf7024780..bcbbbb22a1 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -38,7 +38,7 @@ class job extends control */ public function browse($repoID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $repos = $this->loadModel('repo')->getRepoPairs('devops'); + $repos = $this->loadModel('repo')->getRepoPairs('devops'); if(empty($repos)) $this->locate($this->repo->createLink('create')); $repoID = $this->repo->saveState($repoID); diff --git a/module/mr/js/create.js b/module/mr/js/create.js index e3db9b6ce6..ab97fc59ee 100644 --- a/module/mr/js/create.js +++ b/module/mr/js/create.js @@ -50,6 +50,9 @@ $(function() $('#sourceProject').change(function() { + $('#sourceBranch,#targetProject,#targetBranch').empty(); + $('#sourceBranch,#targetProject,#targetBranch').chosen().trigger("chosen:updated");; + var hostID = $('#hostID').val(); var sourceProject = urlencode($(this).val()); if(!sourceProject) return false; @@ -142,14 +145,8 @@ $(function() $('#hostID').change(function() { - $('#sourceProject').val(''); - $('#sourceProject').chosen().trigger("chosen:updated");; - $('#sourceBranch').val(''); - $('#sourceBranch').chosen().trigger("chosen:updated");; - $('#targetProject').val(''); - $('#targetProject').chosen().trigger("chosen:updated");; - $('#targetBranch').val(''); - $('#targetBranch').chosen().trigger("chosen:updated");; + $('#sourceProject,#sourceBranch,#targetProject,#targetBranch').empty(); + $('#sourceProject,#sourceBranch,#targetProject,#targetBranch').chosen().trigger("chosen:updated");; var hostID = $('#hostID').val(); if(hostID == '') return false;