Merge branch 'master' of github.com:easysoft/zentaopms

framework/base/router.class.php

@@ -372,7 +372,6 @@ class baseRouter
         $this->setErrorHandler();
         $this->setTimezone();
         $this->startSession();
-        $this->setProgram2Session();
 
         if($this->config->framework->multiSite)     $this->setSiteCode() && $this->loadExtraConfig();
         if($this->config->framework->autoConnectDB) $this->connectDB();
@@ -840,18 +839,6 @@ class baseRouter
         }
     }
 
-    /**
-     * 从Get里取progarm id 设置到session中
-     * Set program id into session.
-     *
-     * @access public
-     * @return void
-     */
-    public function setProgram2Session()
-    {    
-        if(isset($_GET['pgmID'])) $this->session->set('program', $_GET['pgmID']); //Set program into session.
-    } 
-
     /**
      * 根据用户浏览器的语言设置和服务器配置，选择显示的语言。
      * 优先级：$lang参数 > session > cookie > 浏览器 > 配置文件。

module/block/view/qastatisticblock.html.php

@@ -92,7 +92,7 @@ $(function()
         <?php foreach($products as $product):?>
         <li <?php if($product == reset($products)) echo "class='active'";?> productID='<?php echo $product->id;?>'>
           <a href="javascript:;" data-target="#tabQaProduct<?php echo $product->id;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a>
-        <?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->product->browse}");?></li>
+        <?php echo html::a(helper::createLink('bug', 'browse', "productID=$product->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->bug->browse}");?></li>
         <?php $index++;?>
         <?php endforeach;?>
         <li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>