Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/product/control.php

@@ -373,11 +373,11 @@ class product extends control
     /**
      * Batch edit products.
      *
-     * @param  int    $productID
+     * @param  int    $programID
      * @access public
      * @return void
      */
-    public function batchEdit($productID = 0)
+    public function batchEdit($programID = 0)
     {
         $this->lang->product->switcherMenu = '';
         if($this->post->names)
@@ -413,6 +413,15 @@ class product extends control
             $appendRdUsers[$product->RD] = $product->RD;
         }
 
+        if($programID)
+        {
+            $this->app->rawModule = 'program';
+            $this->app->rawMethod = 'pgmproduct';
+            $this->lang->navGroup->program = 'program';
+            $this->loadModel('program')->setPGMViewMenu($programID);
+            $this->lang->program->switcherMenu = $this->program->getPGMCommonAction() . $this->program->getPGMSwitcher($programID, true);
+        }
+
         $this->loadModel('user');
         $poUsers = $this->user->getPairs('nodeleted|pofirst', $appendPoUsers);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;

module/program/view/pgmproduct.html.php

@@ -51,7 +51,7 @@
             <?php endif;?>
           </tr>
           <tr class="text-center">
-            <th><?php echo $lang->story->activate;?></th>
+            <th style="border-left: 1px solid #ddd;"><?php echo $lang->story->activate;?></th>
             <th><?php echo $lang->story->close;?></th>
             <th><?php echo $lang->story->draft;?></th>
             <th><?php echo $lang->story->completeRate;?></th>