From d1129ebf9f993a48a737fc5cd5465e168041dded Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 10 Nov 2015 17:29:21 +0800
Subject: [PATCH] * finish task #2382.

---
 module/story/control.php               | 2 ++
 module/story/view/batchcreate.html.php | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index d7d13be58d..e2ac4458ee 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -253,6 +253,7 @@ class story extends control
         $this->view->position[]       = $this->lang->story->common;
         $this->view->position[]       = $this->lang->story->batchCreate;
         $this->view->products         = $products;
+        $this->view->product          = $product;
         $this->view->moduleID         = $moduleID;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
         $this->view->plans            = $plans; 
@@ -264,6 +265,7 @@ class story extends control
         $this->view->storyTitle       = $title;
         $this->view->spec             = $spec;
         $this->view->branch           = $branch;
+        $this->view->branchGroups     = $this->loadModel('branch')->getByProducts($productID);
 
         $this->display();
     }
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 0b082f2a6c..450779ef0c 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -14,7 +14,11 @@
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->story->batchCreate;?></strong>
+    <strong>
+      <small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
+      <?php echo $lang->story->batchCreate;?>
+      <?php if($product->type !== 'normal') echo '<span class="label label-danger">' . $branchGroups[$productID][$branch] . '</span>';?>
+    </strong>
     <div class='actions'>
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>
       <?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'")?>