Finish task#3300 已验收的项目需求所处阶段只能改到发布,cost:0.2 left:0

module/project/view/edit.html.php

@@ -117,7 +117,7 @@
               <div class='input-group'>
                 <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)'");?>
                 <span class='input-group-addon fix-border' style='padding:0px'></span>
-                <?php if($product->type != 'normal') echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control' style='width:80px'")?>
+                <?php if($product->type != 'normal' and isset($branchGroups[$product->id])) echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control' style='width:80px'")?>
               </div>
             </div>
             <?php $i++;?>

module/story/model.php

@@ -976,6 +976,9 @@ class storyModel extends model
             $story->lastEditedDate = $now;
             $story->stage          = $stage;
 
+            /* When stage is verified then only change to released. */
+            if($oldStory->stage == 'verified' and $stage->stage != 'released') $stage->stage = 'verified';
+
             $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
             if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story);
         }