diff --git a/module/ci/config.php b/module/ci/config.php index 12f4a8ca55..7af713433a 100644 --- a/module/ci/config.php +++ b/module/ci/config.php @@ -7,3 +7,8 @@ $config->jenkins->edit->requiredFields = 'name'; $config->repo->create->requiredFields = 'SCM,name,path,encoding,client,credential'; $config->repo->edit->requiredFields = 'SCM,name,path,encoding,client,credential'; +$config->repo->cacheTime = 10; +$config->repo->syncTime = 10; +$config->repo->batchNum = 100; +$config->repo->images = '|png|gif|jpg|ico|jpeg|bmp|'; +$config->repo->binary = '|pdf|'; \ No newline at end of file diff --git a/module/ci/control.php b/module/ci/control.php index 9afdd755e1..8ca97cdaa6 100644 --- a/module/ci/control.php +++ b/module/ci/control.php @@ -314,7 +314,8 @@ class ci extends control if(dao::isError()) die(js::error(dao::getError())); if(!$needSync) { - die(js::locate($this->ci->createLink('showSyncComment', "repoID=$repoID"), 'parent')); + $link = $this->ci->createLink('showSyncComment', "repoID=$repoID"); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link)); } $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseRepo'))); } @@ -405,8 +406,8 @@ class ci extends control unset($branches[$branch]); if($branch == $branchID) { - $this->ci->setRepoBranch($branchID); - setcookie("syncBranch", $branchID, 0, $this->config->webRoot); +// $this->ci->setRepoBranch($branchID); +// setcookie("syncBranch", $branchID, 0, $this->config->webRoot); break; } } @@ -416,7 +417,7 @@ class ci extends control $latestInDB = $this->dao->select('DISTINCT t1.*')->from(TABLE_REPOHISTORY)->alias('t1') ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision') ->where('t1.repo')->eq($repoID) - ->beginIF($repo->SCM == 'Git' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() +// ->beginIF($repo->SCM == 'Git' and $this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->orderBy('t1.time') ->limit(1) ->fetch(); diff --git a/module/ci/model.php b/module/ci/model.php index c222e1a7a5..a91fd957e1 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -402,13 +402,13 @@ class ciModel extends model $count = $this->dao->select('count(DISTINCT t1.id) as count')->from(TABLE_REPOHISTORY)->alias('t1') ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision') ->where('t1.repo')->eq($repoID) - ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() +// ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->fetch('count'); $lastComment = $this->dao->select('t1.*')->from(TABLE_REPOHISTORY)->alias('t1') ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision') ->where('t1.repo')->eq($repoID) - ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() +// ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->orderBy('t1.time desc') ->limit(1) ->fetch(); @@ -431,11 +431,11 @@ class ciModel extends model * @access public * @return void */ - public function setRepoBranch($branch) - { - setcookie("repoBranch", $branch, 0, $this->config->webRoot); - $_COOKIE['repoBranch'] = $branch; - } +// public function setRepoBranch($branch) +// { +// setcookie("repoBranch", $branch, 0, $this->config->webRoot); +// $_COOKIE['repoBranch'] = $branch; +// } /** * Save commit. @@ -526,7 +526,7 @@ class ciModel extends model $stmt = $this->dao->select('DISTINCT t1.id')->from(TABLE_REPOHISTORY)->alias('t1') ->leftJoin(TABLE_REPOBRANCH)->alias('t2')->on('t1.id=t2.revision') ->where('t1.repo')->eq($repoID) - ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() +// ->beginIF($this->cookie->repoBranch)->andWhere('t2.branch')->eq($this->cookie->repoBranch)->fi() ->orderBy('time') ->query();