finish the task #879
This commit is contained in:
@@ -292,7 +292,6 @@ class bug extends control
|
||||
$builds = $this->loadModel('build')->getProductBuildPairs($productID, 'noempty');
|
||||
$stories = $this->story->getProductStoryPairs($productID);
|
||||
}
|
||||
|
||||
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->create;
|
||||
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||
$this->view->position[] = $this->lang->bug->create;
|
||||
|
||||
@@ -101,7 +101,12 @@ class buildModel extends model
|
||||
->where('product')->eq((int)$productID)
|
||||
->andWhere('deleted')->eq(0)
|
||||
->orderBy('date desc, id desc')->fetchPairs();
|
||||
$release = $this->dao->select('name')->from(TABLE_RELEASE)
|
||||
->where('build')->eq(0)
|
||||
->andWhere('deleted')->eq(0)
|
||||
->fetchPairs();
|
||||
if(!$builds) return $sysBuilds;
|
||||
foreach($release as $buildID => $releaseName) $builds[$buildID] = $releaseName;
|
||||
return $sysBuilds + $builds;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
$config->release->create->requiredFields = 'name,build,date';
|
||||
$config->release->edit->requiredFields = 'name,build,date';
|
||||
$config->release->create->requiredFields = 'name,date';
|
||||
$config->release->edit->requiredFields = 'name,date';
|
||||
|
||||
$config->release->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
|
||||
$config->release->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
|
||||
|
||||
@@ -102,11 +102,18 @@ class release extends control
|
||||
$release = $this->release->getById((int)$releaseID);
|
||||
$this->commonAction($release->product);
|
||||
$build = $this->build->getById($release->build);
|
||||
|
||||
if($release->build !=0)
|
||||
{
|
||||
/* Get stories and bugs. */
|
||||
$orderBy = 'status_asc, stage_asc, id_desc';
|
||||
$stories = $this->story->getProjectStories($build->project, $orderBy);
|
||||
$bugs = $this->bug->getProjectBugs($build->project);
|
||||
}
|
||||
else
|
||||
{
|
||||
$stories = array();
|
||||
$bugs = array();
|
||||
}
|
||||
|
||||
$this->view->header->title = $this->lang->release->edit;
|
||||
$this->view->position[] = $this->lang->release->edit;
|
||||
|
||||
@@ -82,7 +82,7 @@ class releaseModel extends model
|
||||
->join('bugs', ',')
|
||||
->remove('allchecker')
|
||||
->get();
|
||||
$this->dao->insert(TABLE_RELEASE)->data($release)->autoCheck()->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique')->exec();
|
||||
$this->dao->insert(TABLE_RELEASE)->data($release)->batchCheck($this->config->release->create->requiredFields, 'notempty')->check('name','unique')->exec();
|
||||
$releaseID = $this->dao->lastInsertID();
|
||||
$this->dao->update(TABLE_STORY)->set('stage')->eq('released')->where('id')->in($release->stories)->exec();
|
||||
if(!dao::isError()) return $releaseID;
|
||||
@@ -106,7 +106,6 @@ class releaseModel extends model
|
||||
->join('bugs', ',')
|
||||
->get();
|
||||
$this->dao->update(TABLE_RELEASE)->data($release)
|
||||
->autoCheck()
|
||||
->batchCheck($this->config->release->edit->requiredFields, 'notempty')
|
||||
->check('name','unique', "id != $releaseID")
|
||||
->where('id')->eq((int)$releaseID)
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
<td>
|
||||
<?php
|
||||
echo html::select('build', $builds, '', "class='select-3' onchange=loadStoriesAndBugs(this.value,$productID)");
|
||||
unset($builds['']);
|
||||
if(empty($builds)) echo $lang->build->notice;
|
||||
?>
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user