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

module/bug/control.php

@@ -476,8 +476,13 @@ class bug extends control
         $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
-        $productList = $this->product->getOrderedProducts('all', 40, $this->projectID);
-        foreach($productList as $product) $products[$product->id] = $product->name;
+        $products = $this->products;
+        if($projectID)
+        {
+            $products    = array();
+            $productList = $this->product->getOrderedProducts('all', 40, $projectID);
+            foreach($productList as $product) $products[$product->id] = $product->name;
+        }
 
         /* Set custom. */
         foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;

module/execution/control.php

@@ -2762,7 +2762,7 @@ class execution extends control
                 unset($fields[$key]);
             }
 
-            $executionStats = $this->execution->getStats($this->session->PRJ, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
+            $executionStats = $this->project->getStats($this->session->PRJ, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
             $users        = $this->loadModel('user')->getPairs('noletter');
             foreach($executionStats as $i => $execution)
             {

module/execution/model.php

@@ -2369,7 +2369,7 @@ class executionModel extends model
             $member->type    = $executionType;
 
             $executionMember[$account] = $member;
-            $this->dao->insert(TABLE_TEAM)->data($member)->exec();
+            $this->dao->replace(TABLE_TEAM)->data($member)->exec();
         }
 
         /* Only changed account update userview. */

module/execution/view/all.html.php

@@ -44,7 +44,7 @@
     <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . ($from == 'execution' ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary'");?>
   </div>
 </div>
-<div id='mainContent' class="main-row">
+<div id='mainContent' class="main-row fade">
   <?php if($from == 'execution'):?>
   <div id="sidebar" class="side-col">
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>

module/project/control.php

@@ -293,6 +293,8 @@ class project extends control
             }
         }
 
+        $this->lang->noMenuModule[] = 'project';
+
         $name      = '';
         $code      = '';
         $team      = '';

module/project/lang/en.php

@@ -77,7 +77,7 @@ $lang->project->leftStories        = 'Left Stories';
 $lang->project->leftTasks          = 'Left Tasks';
 $lang->project->leftBugs           = 'Left Bugs';
 $lang->project->children           = 'Child Project';
-$lang->project->parent             = 'Parent Project';
+$lang->project->parent             = 'Parent Program';
 $lang->project->allStories         = 'All Stories';
 $lang->project->doneStories        = 'Finished Stories';
 $lang->project->doneProjects       = 'Finished';

module/project/lang/zh-cn.php

@@ -78,7 +78,7 @@ $lang->project->leftStories        = '剩余需求';
 $lang->project->leftTasks          = '剩余任务';
 $lang->project->leftBugs           = '剩余Bug';
 $lang->project->children           = '子项目';
-$lang->project->parent             = '父项目';
+$lang->project->parent             = '父项目集';
 $lang->project->allStories         = '总需求';
 $lang->project->doneStories        = '已完成';
 $lang->project->doneProjects       = '已结束';

module/project/model.php

@@ -104,7 +104,7 @@ class projectModel extends model
     public function getBudgetUnitList()
     {
         $budgetUnitList = array();
-        foreach(explode(',', $this->config->program->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
+        foreach(explode(',', $this->config->project->unitList) as $unit) $budgetUnitList[$unit] = zget($this->lang->project->unitList, $unit, '');
 
         return $budgetUnitList;
     }

module/project/view/browse.html.php

@@ -64,10 +64,12 @@ js::set('browseType', $browseType);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
-        <?php if($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
+        <?php if(isset($this->config->maxVersion)):?>
+        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
+        <?php elseif($this->config->systemMode == 'new'):?>
+        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info"');?>
         <?php else:?>
-        <?php common::printLink('project', 'create', '', '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
+        <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i>' . $lang->execution->create, '', 'class="btn btn-info"');?>
         <?php endif;?>
       </p>
     </div>