diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index 4de508692a..45c970d211 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -104,6 +104,8 @@ class projectrelease extends control $this->app->loadConfig('release'); $this->config->projectrelease->create = $this->config->release->create; + $this->app->loadLang('release'); + if(!empty($_POST)) { $releaseID = $this->projectrelease->create($projectID); @@ -130,6 +132,7 @@ class projectrelease extends control $this->view->builds = $builds; $this->view->lastRelease = $this->projectrelease->getLast($projectID); $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); + $this->view->confirmLink = $this->lang->release->confirmLink; $this->display(); } diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 0fa9fe0c22..6ce02f8715 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -134,7 +134,7 @@ class projectreleaseModel extends model ->setIF($productID, 'product', $productID) ->setIF($branch, 'branch', $branch) ->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags) - ->remove('allchecker,files,labels,uid') + ->remove('allchecker,files,labels,uid,sync') ->get(); /* Auto create build when release is not link build. */ @@ -175,7 +175,16 @@ class projectreleaseModel extends model } } - if($release->build) $release->branch = $this->dao->select('branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch('branch'); + if($release->build) + { + $buildInfo = $this->dao->select('branch, stories, bugs')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch(); + $release->branch = $buildInfo->branch; + if($this->post->sync == 'true'); + { + $release->stories = $buildInfo->stories; + $release->bugs = $buildInfo->bugs; + } + } $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_RELEASE)->data($release) diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php index 4973cb1f44..b0d7f5917b 100644 --- a/module/projectrelease/view/create.html.php +++ b/module/projectrelease/view/create.html.php @@ -12,6 +12,7 @@ ?> +